Changeset b5ba8f6 in mainline for uspace/Makefile

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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

@@ -70 +70 @@
         app/vuhid \
         app/netecho \
+        app/netspeed \
         app/nettest1 \
         app/nettest2 \
@@ -90 +91 @@
         srv/devman \
         srv/loader \
+        srv/net/dhcp \
         srv/net/dnsrsrv \
         srv/net/ethip \
@@ -121 +123 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
+        srv/hid/rfb \
         drv/audio/sb16 \
         drv/infrastructure/root \