Changeset 121e7adf in mainline


Ignore:
Timestamp:
2012-01-16T09:23:55Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2d2c6ce
Parents:
8989f2a7 (diff), 3ea725e (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 mainline

Files:
6 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r8989f2a7 r121e7adf  
    109109        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    110110        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
     111        $(USPACE_PATH)/srv/hid/remcons/remcons \
    111112        $(USPACE_PATH)/srv/taskmon/taskmon \
    112113        $(USPACE_PATH)/srv/net/nil/eth/eth \
  • uspace/Makefile

    r8989f2a7 r121e7adf  
    9595        srv/hid/fb \
    9696        srv/hid/input \
     97        srv/hid/remcons \
    9798        srv/hw/char/s3c24xx_uart \
    9899        srv/net/il/arp \
  • uspace/app/init/init.c

    r8989f2a7 r121e7adf  
    312312       
    313313        spawn("/srv/clip");
     314        spawn("/srv/remcons");
    314315       
    315316        /*
Note: See TracChangeset for help on using the changeset viewer.