Changeset f126c87 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2016-09-01T16:46:27Z (9 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2a2fbc8
Parents:
9befb0d (diff), bdfdc51c (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 mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r9befb0d rf126c87  
    218218        $(USPACE_PATH)/app/websrv/websrv \
    219219        $(USPACE_PATH)/app/date/date \
     220        $(USPACE_PATH)/app/vcalc/vcalc \
    220221        $(USPACE_PATH)/app/vdemo/vdemo \
    221222        $(USPACE_PATH)/app/viewer/viewer \
Note: See TracChangeset for help on using the changeset viewer.