osd-contiki/core
Harald Pichler 2f8549aaae Merge branch 'contiki'
Conflicts:
	cpu/cc26xx-cc13xx/lib/cc13xxware
	cpu/cc26xx-cc13xx/lib/cc26xxware
2017-01-31 15:00:59 +01:00
..
cfs Always enable the I/O semantics function in Coffee. 2016-11-25 16:02:44 +01:00
ctk Merge pull request #1293 from simonduq/pr/fix-warnings 2015-11-10 08:49:11 +01:00
dev Merge pull request #920 from cetic/pr-slip-queue 2016-07-01 13:50:18 +02:00
lib core/lib/gcr.c: fix warning: function declaration isn't a prototype 2016-03-02 07:12:27 +01:00
loader Added MSP430X ELFLOADER support to load image with large memory model. 2015-06-15 17:53:18 +05:30
net Merge branch 'contiki' 2017-01-31 15:00:59 +01:00
sys mt: Fix preemption 2016-11-24 22:30:26 +01:00
contiki-default-conf.h Fix semantic of UIP_ND6_SEND_NA and add UIP_ND6_SEND_NS 2017-01-16 15:48:14 +01:00
contiki-lib.h 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
contiki-net.h Add standardized nameserver pool 2015-01-09 09:44:06 +01:00
contiki-version.h Bumped the version number from 2.6 to 3.x, which is to be used in the development branch 2013-12-12 17:33:18 +01:00
contiki.h 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