Merge branch 'develop' into contrib/recursive-make

This commit is contained in:
Simon Duquennoy 2018-05-28 19:22:06 +02:00 committed by GitHub
commit 2b2f258168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions

View File

@ -3,4 +3,7 @@ all: $(CONTIKI_PROJECT)
MODULES += os/services/shell
CONTIKI = ../../..
PLATFORMS_EXCLUDE = sky
include $(CONTIKI)/Makefile.include