Changeset 4285851 in mainline
- Timestamp:
- 2013-09-12T22:15:30Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- eabce2e
- Parents:
- ddd0499d (diff), fada53f (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
- 3 edited
-
.bzrignore (modified) (1 diff)
-
boot/Makefile.common (modified) (1 diff)
-
uspace/Makefile (modified) (1 diff)
-
uspace/app/netspeed/Makefile (added)
-
uspace/app/netspeed/netspeed.c (added)
Legend:
- Unmodified
- Added
- Removed
-
.bzrignore
rddd0499d r4285851 269 269 uspace/dist/srv/dhcp 270 270 uspace/srv/net/dhcp/dhcp 271 uspace/app/netspeed/netspeed 272 uspace/dist/app/netspeed -
boot/Makefile.common
rddd0499d r4285851 197 197 $(USPACE_PATH)/app/nettest3/nettest3 \ 198 198 $(USPACE_PATH)/app/netecho/netecho \ 199 $(USPACE_PATH)/app/netspeed/netspeed \ 199 200 $(USPACE_PATH)/app/nterm/nterm \ 200 201 $(USPACE_PATH)/app/ping/ping \ -
uspace/Makefile
rddd0499d r4285851 70 70 app/vuhid \ 71 71 app/netecho \ 72 app/netspeed \ 72 73 app/nettest1 \ 73 74 app/nettest2 \
Note:
See TracChangeset
for help on using the changeset viewer.
