Changeset bf1733d3 in mainline for uspace/Makefile


Ignore:
Timestamp:
2015-04-27T20:24:41Z (9 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2b5d966
Parents:
c1fd281 (diff), dcba819 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rc1fd281 rbf1733d3  
    9494        app/wavplay \
    9595        app/websrv \
     96        app/wifi_supplicant \
    9697        srv/audio/hound \
    9798        srv/clipboard \
     
    164165        drv/nic/rtl8139 \
    165166        drv/nic/rtl8169 \
     167        drv/nic/ar9271 \
    166168        drv/platform/icp
    167169
     
    218220        lib/fs \
    219221        lib/block \
     222        lib/crypto \
    220223        lib/clui \
    221224        lib/fmtutil \
     
    248251        lib/posix \
    249252        lib/mbr \
    250         lib/gpt
     253        lib/gpt \
     254        lib/ieee80211
    251255
    252256LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.