Changeset ae49252 in mainline for uspace/Makefile


Ignore:
Timestamp:
2012-07-18T21:45:07Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5f4cf872
Parents:
349e510d (diff), 7030bc9 (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

    r349e510d rae49252  
    8686        srv/vfs \
    8787        srv/bd/ata_bd \
     88        srv/bd/sata_bd \
    8889        srv/bd/file_bd \
    8990        srv/bd/gxe_bd \
    … …  
    106107        drv/infrastructure/root \
    107108        drv/infrastructure/rootvirt \
     109        drv/block/ahci \
    108110        drv/char/i8042 \
    109111        drv/char/ps2mouse \
Note: See TracChangeset for help on using the changeset viewer.