Commit graph

7 commits

Author SHA1 Message Date
Harald Pichler 48fff35bd9 update for new contiki fetch 2014-11-19 13:22:20 +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 245d801862 add merkurboard coap client demo 2014-11-19 12:14:24 +01:00
Marcus Priesch 277f63d76a timer4 servo pwm 2014-11-19 12:10:09 +01:00
Harald Pichler e645833a99 add light-actor 2014-11-19 12:06:54 +01:00
Harald Pichler 8c08364cad add servo example 2014-11-19 12:06:45 +01:00
Harald Pichler 81e6734626 add climate example 2014-11-19 12:04:53 +01:00
Renamed from platform/osd-merkur/Makefile.merkur (Browse further)