Changeset b1c57a8 in mainline for boot

Timestamp:

2014-10-09T15:03:55Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• boot/Makefile.common (modified) (1 diff)

boot/Makefile.common

@@ -192 +192 @@
         $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/nic/nic \
+        $(USPACE_PATH)/app/rcutest/rcutest \
+        $(USPACE_PATH)/app/rcubench/rcubench \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/sportdmp/sportdmp \