Changeset f2eece1 in mainline for boot


Ignore:
Timestamp:
2012-05-12T12:03:45Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8060341a
Parents:
81a7858 (diff), 84c86819 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r81a7858 rf2eece1  
    182182        $(USPACE_PATH)/app/nettest3/nettest3 \
    183183        $(USPACE_PATH)/app/netecho/netecho \
     184        $(USPACE_PATH)/app/nterm/nterm \
    184185        $(USPACE_PATH)/app/ping/ping \
    185186        $(USPACE_PATH)/app/stats/stats \
Note: See TracChangeset for help on using the changeset viewer.