Changeset b1c57a8 in mainline for uspace/Makefile


Ignore:
Timestamp:
2014-10-09T15:03:55Z (10 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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r21799398 rb1c57a8  
    6161        app/nterm \
    6262        app/redir \
     63        app/rcutest \
     64        app/rcubench \
    6365        app/sbi \
    6466        app/sportdmp \
    … …  
    227229        lib/trackmod \
    228230        lib/uri \
     231        lib/urcu \
    229232        lib/usb \
    230233        lib/usbhost \
Note: See TracChangeset for help on using the changeset viewer.