Changeset 121e7adf in mainline
- Timestamp:
- 2012-01-16T09:23:55Z (13 years ago)
- 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. - Files:
-
- 6 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r8989f2a7 r121e7adf 109 109 $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \ 110 110 $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \ 111 $(USPACE_PATH)/srv/hid/remcons/remcons \ 111 112 $(USPACE_PATH)/srv/taskmon/taskmon \ 112 113 $(USPACE_PATH)/srv/net/nil/eth/eth \ -
uspace/Makefile
r8989f2a7 r121e7adf 95 95 srv/hid/fb \ 96 96 srv/hid/input \ 97 srv/hid/remcons \ 97 98 srv/hw/char/s3c24xx_uart \ 98 99 srv/net/il/arp \ -
uspace/app/init/init.c
r8989f2a7 r121e7adf 312 312 313 313 spawn("/srv/clip"); 314 spawn("/srv/remcons"); 314 315 315 316 /*
Note:
See TracChangeset
for help on using the changeset viewer.