Changeset b40bfac in mainline for boot/Makefile.common


Ignore:
Timestamp:
2010-11-08T07:13:25Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
63a1e60
Parents:
d70a463 (diff), 3da12d74 (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rd70a463 rb40bfac  
    107107        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
    108108        $(USPACE_PATH)/srv/net/net/net \
    109         $(USPACE_PATH)/srv/net/netstart/netstart \
    110109        $(USPACE_PATH)/srv/devman/devman
    111110       
    … …  
    136135        $(USPACE_PATH)/app/tetris/tetris \
    137136        $(USPACE_PATH)/app/trace/trace \
     137        $(USPACE_PATH)/app/netstart/netstart \
    138138        $(USPACE_PATH)/app/nettest1/nettest1 \
    139139        $(USPACE_PATH)/app/nettest2/nettest2 \
Note: See TracChangeset for help on using the changeset viewer.