Changeset c41834a in mainline
- Timestamp:
- 2010-12-28T22:19:01Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1e9f8ab
- Parents:
- 097967b (diff), f4a2d624 (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:
-
- 2 added
- 2 edited
-
boot/Makefile.common (modified) (1 diff)
-
uspace/Makefile (modified) (1 diff)
-
uspace/app/websrv/Makefile (added)
-
uspace/app/websrv/websrv.c (added)
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r097967b rc41834a 141 141 $(USPACE_PATH)/app/tasks/tasks \ 142 142 $(USPACE_PATH)/app/top/top \ 143 $(USPACE_PATH)/app/sysinfo/sysinfo 143 $(USPACE_PATH)/app/sysinfo/sysinfo \ 144 $(USPACE_PATH)/app/websrv/websrv 144 145 145 146 ifneq ($(CONFIG_BAREBONE),y) -
uspace/Makefile
r097967b rc41834a 53 53 app/nettest2 \ 54 54 app/ping \ 55 app/websrv \ 55 56 app/sysinfo \ 56 57 srv/clip \
Note:
See TracChangeset
for help on using the changeset viewer.
