Simon Duquennoy d1641530dd Merge branch 'wip/platform-cleanup' into wip/mac-rdc ... Conflicts: drivers/dev/cc2520/cc2520.c drivers/platform/wismote/Makefile.wismote drivers/platform/wismote/contiki-conf.h drivers/platform/wismote/contiki-wismote-main.c drivers/platform/z1/Makefile.z1 drivers/platform/z1/contiki-conf.h drivers/platform/z1/contiki-z1-main.c examples/ipso-objects/cooja-example-ipso-objects.csc examples/rssi-scanner/Makefile		2017-05-17 15:13:16 +02:00
..
er-rest-example	Remove explicit configuration of nullrdc as it is the new default	2017-05-17 14:19:14 +02:00
json-ws	Merge branch 'wip/platform-cleanup' into wip/mac-rdc	2017-05-17 15:13:16 +02:00
multicast	Remove RDC layer	2017-05-17 15:09:19 +02:00
native-border-router	Remove RDC layer	2017-05-17 15:09:19 +02:00
rpl-border-router	Merge branch 'wip/platform-cleanup' into wip/mac-rdc	2017-05-17 15:13:16 +02:00
rpl-tsch	Merge branch 'wip/platform-cleanup' into wip/mac-rdc	2017-05-17 15:13:16 +02:00
rpl-udp	Merge branch 'wip/platform-cleanup' into wip/mac-rdc	2017-05-17 15:13:16 +02:00
simple-udp-rpl
slip-radio	Merge branch 'wip/platform-cleanup' into wip/mac-rdc	2017-05-17 15:13:16 +02:00
udp-ipv6