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

Changeset 4285851 in mainline


Ignore:
Timestamp:
2013-09-12T22:15:30Z (8 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master
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.
Message:

Merge netspeed

Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    rddd0499d r4285851  
    269269uspace/dist/srv/dhcp
    270270uspace/srv/net/dhcp/dhcp
     271uspace/app/netspeed/netspeed
     272uspace/dist/app/netspeed
  • boot/Makefile.common

    rddd0499d r4285851  
    197197        $(USPACE_PATH)/app/nettest3/nettest3 \
    198198        $(USPACE_PATH)/app/netecho/netecho \
     199        $(USPACE_PATH)/app/netspeed/netspeed \
    199200        $(USPACE_PATH)/app/nterm/nterm \
    200201        $(USPACE_PATH)/app/ping/ping \
  • uspace/Makefile

    rddd0499d r4285851  
    7070        app/vuhid \
    7171        app/netecho \
     72        app/netspeed \
    7273        app/nettest1 \
    7374        app/nettest2 \
Note: See TracChangeset for help on using the changeset viewer.