Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico ... Conflicts resolved: core/net/mac/contikimac/contikimac.c		2016-06-30 09:28:54 +02:00
..
border-router	Change the default IPv6 prefix from aaaa::/64 to fd00::/64	2016-03-07 17:47:44 +01:00
cc2531-usb-demo	Clarified that a newline is needed for the echo	2015-07-26 16:17:34 -07:00
sniffer	Channel check interval is clock_time_t	2016-05-07 11:46:27 +02:00
udp-ipv6	Change the default IPv6 prefix from aaaa::/64 to fd00::/64	2016-03-07 17:47:44 +01:00
blink-hello.c	Remove documentation references to the Sensinode platform	2016-01-10 15:09:31 +00:00
hello-world.c	New platform: TI cc2530 Development Kit	2012-03-23 14:41:07 +00:00
Makefile	Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack.	2014-12-01 20:13:09 +01:00
Makefile.target	New platform: TI cc2530 Development Kit	2012-03-23 14:41:07 +00:00
sensors-demo.c	Code style fixes: cc2530dk examples	2012-12-16 19:28:56 +00:00
timer-test.c	Code style fixes: cc2530dk examples	2012-12-16 19:28:56 +00:00