Changeset f7e69f5 in mainline for uspace/Makefile


Ignore:
Timestamp:
2012-05-25T23:17:33Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e1e4192
Parents:
0a0e6e7 (diff), df3f85f (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
  • uspace/Makefile

    r0a0e6e7 rf7e69f5  
    139139endif
    140140
     141ifeq ($(CONFIG_MSIM),y)
     142DIRS += \
     143        app/msim
     144endif
     145
    141146## Platform-specific hardware support
    142147#
Note: See TracChangeset for help on using the changeset viewer.