Changeset ccf282f in mainline for boot/Makefile.common


Ignore:
Timestamp:
2013-06-23T20:06:09Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
66cb7a2
Parents:
96cbd18 (diff), ddb1922 (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/slip.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r96cbd18 rccf282f  
    116116        $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
    117117        $(USPACE_PATH)/srv/net/loopip/loopip \
     118        $(USPACE_PATH)/srv/net/slip/slip \
    118119        $(USPACE_PATH)/srv/net/tcp/tcp \
    119120        $(USPACE_PATH)/srv/net/udp/udp \
Note: See TracChangeset for help on using the changeset viewer.