5 commits

Author	SHA1	Message	Date
Harald Pichler	48fff35bd9	update for new contiki fetch	2014-11-19 13:22:20 +01:00
Harald Pichler	e9c033688b	bugfix	2014-11-19 13:21:52 +01:00
Harald Pichler	1fc136d379	add BOOTLOADER_GET_MAC ... Conflicts: platform/osd-merkur/params.h	2014-11-19 13:19:44 +01:00
Harald Pichler	81e6734626	add climate example	2014-11-19 12:04:53 +01:00
Harald Pichler	715cfa3a75	add platform osd-merkur	2014-11-19 12:04:38 +01:00