Changeset 7137fe3f in mainline for boot


Ignore:
Timestamp:
2012-09-18T18:57:18Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
df7f9fb5
Parents:
289fa65 (diff), ce1df04 (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

    r289fa65 r7137fe3f  
    198198        $(USPACE_PATH)/app/websrv/websrv \
    199199        $(USPACE_PATH)/app/date/date \
    200         $(USPACE_PATH)/app/vdemo/vdemo \
    201         $(USPACE_PATH)/app/vlaunch/vlaunch \
    202         $(USPACE_PATH)/app/vterm/vterm \
    203200        $(USPACE_PATH)/app/vdemo/vdemo
    204201
Note: See TracChangeset for help on using the changeset viewer.