Changeset e522da4 in mainline


Ignore:
Timestamp:
2012-08-24T15:23:27Z (12 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
070ad12
Parents:
041ab64 (diff), 48e3190 (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

Files:
15 added
2 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r041ab64 re522da4  
    107107        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
    108108        $(USPACE_PATH)/srv/fs/exfat/exfat \
     109        $(USPACE_PATH)/srv/fs/udf/udf \
    109110        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    110111        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
  • uspace/Makefile

    r041ab64 re522da4  
    9595        srv/bd/part/mbr_part \
    9696        srv/fs/exfat \
     97        srv/fs/udf \
    9798        srv/fs/fat \
    9899        srv/fs/cdfs \
Note: See TracChangeset for help on using the changeset viewer.