Changeset d900699 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-06-17T16:48:53Z (14 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f3a605be
Parents:
df8110d3 (diff), 98caf49 (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

    rdf8110d3 rd900699  
    8585        srv/hid/s3c24xx_ts \
    8686        srv/hid/fb \
    87         srv/hid/kbd \
     87        srv/hid/input \
    8888        srv/hw/char/i8042 \
    8989        srv/hw/char/s3c24xx_uart \
Note: See TracChangeset for help on using the changeset viewer.