nes-proj/apps
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
..
antelope Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps 2017-05-14 01:14:05 +02:00
at-master AT driver (master) and example 2016-05-15 12:19:04 +02:00
er-coap Keep CoAP 'observe' option length <= 3 bytes 2017-04-08 15:02:52 +01:00
http-post-auth Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps 2017-05-14 01:14:05 +02:00
httpd-ws A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
ipso-objects ipso-temperature: Use "Cel" for degrees celsius 2016-05-04 19:21:56 +02:00
json Merge pull request #1438 from jkent/jsonparse 2016-03-11 14:23:17 +01:00
mqtt Untabify mqtt.c 2017-05-13 15:58:05 +02:00
oma-lwm2m Merge pull request #1677 from gebart/pr/lwm2m-instance-list 2016-09-06 16:50:11 +02:00
orchestra Removing Rime, old platforms, old MAC layers, LLSEC (as a layer), some examples and apps 2017-05-14 01:14:05 +02:00
ping6 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
rest-engine squash clean up left overs 2016-07-09 10:39:23 +02:00
servreg-hack Remove commented-out code 2015-10-20 10:11:47 +02:00
shell Merge branch 'wip/platform-cleanup' into wip/mac-rdc 2017-05-17 15:13:16 +02:00
slip-cmd Updated include paths for the moved files under net/ 2014-01-26 23:20:23 +01:00
unit-test