Changeset 49d819b4 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2010-11-02T23:15:18Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7ae3d6f
Parents:
e06ef614 (diff), d0d1f4f (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    re06ef614 r49d819b4  
    106106        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
    107107        $(USPACE_PATH)/srv/net/net/net \
    108         $(USPACE_PATH)/srv/net/netstart/netstart \
    109108        $(USPACE_PATH)/srv/devman/devman
    110109       
    … …  
    135134        $(USPACE_PATH)/app/tetris/tetris \
    136135        $(USPACE_PATH)/app/trace/trace \
     136        $(USPACE_PATH)/app/netstart/netstart \
    137137        $(USPACE_PATH)/app/nettest1/nettest1 \
    138138        $(USPACE_PATH)/app/nettest2/nettest2 \
Note: See TracChangeset for help on using the changeset viewer.