Commit graph

4 commits

Author SHA1 Message Date
Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
2016-06-30 09:28:54 +02:00
Ralf Schlatterbeck d7e6935ec2 Channel check interval is clock_time_t
Fix channel_check_interval routine in struct rdc_driver to be of type
clock_time_t -- otherwise this may overflow on some architectures.
2016-05-07 11:46:27 +02:00
Simon Duquennoy dea04c67d7 Change the default IPv6 prefix from aaaa::/64 to fd00::/64 2016-03-07 17:47:44 +01:00
Antonio Lignan 45c125949a Unified cc2538 examples into single cc2538-common placeholder 2016-02-04 17:26:11 +01:00