Changeset 903bac0a in mainline for uspace/Makefile

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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

@@ -44 +44 @@
         app/killall \
         app/klog \
+        app/locinfo \
         app/lsusb \
         app/mkfat \
@@ -65 +66 @@
         app/mkbd \
         srv/clip \
-        srv/devmap \
+        srv/loc \
         srv/devman \
         srv/loader \
@@ -79 +80 @@
         srv/fs/fat \
         srv/fs/tmpfs \
-        srv/fs/devfs \
+        srv/fs/locfs \
         srv/fs/ext2fs \
         srv/hid/console \