Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 84439d7 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    r56b962d r84439d7  
    4646        app/tasks \
    4747        app/tester \
    48         app/test_serial \
    4948        app/tetris \
    5049        app/trace \
     
    119118        DIRS += drv/ns8250
    120119        DIRS += drv/uhci
     120        DIRS += drv/usbhub
    121121        DIRS += drv/usbkbd
    122122endif
Note: See TracChangeset for help on using the changeset viewer.