Changeset 71b0d4d4 in mainline for uspace/Makefile

Timestamp:

2012-08-14T03:37:30Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b224a3e

Parents:

2988aec7 (diff), 4802dd7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/Makefile (modified) (3 diffs)

uspace/Makefile

@@ -59 +59 @@
         app/tester \
         app/testread \
+        app/testwrit \
         app/tetris \
         app/trace \
@@ -98 +99 @@
         srv/fs/locfs \
         srv/fs/ext2fs \
+        srv/fs/ext4fs \
         srv/hid/console \
         srv/hid/s3c24xx_ts \
@@ -197 +199 @@
         lib/nic \
         lib/ext2 \
+        lib/ext4 \
         lib/usb \
         lib/usbhost \