8 commits

Author	SHA1	Message	Date
harald42	b6bea56c27	use batmon in battery_sensor	2014-04-15 07:27:30 +02:00
harald42	312a88ad39	update for new contiki fetch	2014-04-15 07:27:29 +02:00
harald42	611e358ad9	add BOOTLOADER_GET_MAC	2014-04-15 07:27:29 +02:00
harald42	cdf4da8461	add merkurboard coap client demo	2014-04-15 07:27:28 +02:00
harald42	3d10f4d0d1	timer4 servo pwm from Priesch Markus	2014-04-15 07:27:28 +02:00
harald42	057a3c3345	add light-actor	2014-04-15 07:27:27 +02:00
harald42	bba7b84a15	add servo example	2014-04-15 07:27:27 +02:00
harald42	7f776ee918	add climate example	2014-04-15 07:27:26 +02:00

Renamed from platform/osd-merkur/Makefile.merkur (Browse further)