Changeset c42f50d in mainline for boot

Timestamp:

2013-10-05T11:53:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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:

• boot/Makefile.common (modified) (3 diffs)

boot/Makefile.common

@@ -118 +118 @@
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
         $(USPACE_PATH)/srv/net/loopip/loopip \
+        $(USPACE_PATH)/srv/net/nconfsrv/nconfsrv \
         $(USPACE_PATH)/srv/net/slip/slip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
@@ -201 +202 @@
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
-        $(USPACE_PATH)/app/ping6/ping6 \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
@@ -211 +211 @@
         $(USPACE_PATH)/app/date/date \
         $(USPACE_PATH)/app/vdemo/vdemo \
+        $(USPACE_PATH)/app/viewer/viewer \
         $(USPACE_PATH)/app/df/df