Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-07-09 08:29:02 +00:00
Code Issues Projects Releases Wiki Activity
1716d837fc
contiki/platform/z1
History
Enric M. Calvo 1716d837fc Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 
Makefile.z1 is broken into .common and .z1 to share it with Z1 Starter Platform

Conflicts:
	.gitignore
	platform/z1/Makefile.z1
2011-03-25 17:46:38 +01:00
..
apps
dev Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 2011-03-25 17:46:38 +01:00
cfs-coffee-arch.h
checkpoint-arch.c
contiki-conf.h Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 2011-03-25 17:46:38 +01:00
contiki-z1-main.c Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 2011-03-25 17:46:38 +01:00
contiki-z1-platform.c
Makefile.common
Makefile.z1 Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup 2011-03-25 17:46:38 +01:00
msp430.c
node-id.c
node-id.h
platform-conf.h