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	Added MAC overwriting/burning capability to the Z1	2011-02-25 15:35:41 +01:00
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	Coffee no longer uses watchdog calls	2011-01-18 15:49:37 +00:00
checkpoint-arch.c	added Z1 platform	2010-08-24 16:26:38 +00:00
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	Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer	2011-02-25 16:08:50 +01:00
Makefile.common	added temperature-sensor to Makefile.common	2011-03-08 09:20:35 +01:00
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	added Z1 platform	2010-08-24 16:26:38 +00:00
node-id.c	Node ID is stored in external flash and restored on bootup	2010-08-26 22:08:11 +00:00
node-id.h	added Z1 platform	2010-08-24 16:26:38 +00:00
platform-conf.h	added Z1 platform	2010-08-24 16:26:38 +00:00