Changeset bee37cf in mainline for Makefile


Ignore:
Timestamp:
2011-07-05T21:21:36Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
5e2aa83, eb66f236
Parents:
3714e79 (diff), f7a55f9 (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

  • Makefile

    r3714e79 rbee37cf  
    106106        $(MAKE) -C uspace clean
    107107        $(MAKE) -C boot clean
     108
     109-include Makefile.local
Note: See TracChangeset for help on using the changeset viewer.