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

Changeset 49505fe in mainline


Ignore:
Timestamp:
2012-08-12T18:38:09Z (9 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
6c34f587
Parents:
371cb6c (diff), 38542dc (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 ext4

Files:
33 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r371cb6c r49505fe  
    106106        $(USPACE_PATH)/srv/fs/exfat/exfat \
    107107        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
     108        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
    108109        $(USPACE_PATH)/srv/hid/remcons/remcons \
    109110        $(USPACE_PATH)/srv/net/ethip/ethip \
     
    173174        $(USPACE_PATH)/app/tester/tester \
    174175        $(USPACE_PATH)/app/testread/testread \
     176        $(USPACE_PATH)/app/testwrit/testwrit \
    175177        $(USPACE_PATH)/app/tetris/tetris \
    176178        $(USPACE_PATH)/app/trace/trace \
  • uspace/Makefile

    r371cb6c r49505fe  
    5858        app/tester \
    5959        app/testread \
     60        app/testwrit \
    6061        app/tetris \
    6162        app/trace \
     
    9798        srv/fs/locfs \
    9899        srv/fs/ext2fs \
     100        srv/fs/ext4fs \
    99101        srv/hid/console \
    100102        srv/hid/s3c24xx_ts \
     
    196198        lib/nic \
    197199        lib/ext2 \
     200        lib/ext4 \
    198201        lib/usb \
    199202        lib/usbhost \
  • uspace/Makefile.common

    r371cb6c r49505fe  
    115115
    116116LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
     117LIBEXT4_PREFIX = $(LIB_PREFIX)/ext4
    117118
    118119LIBUSB_PREFIX = $(LIB_PREFIX)/usb
Note: See TracChangeset for help on using the changeset viewer.