Ralf Schlatterbeck 7d63a0f487 Merge branch 'osd' into ico ... Conflicts resolved: core/net/mac/contikimac/contikimac.c		2016-06-30 09:28:54 +02:00
..
cfs	Renamed the internal dummy_space variable, since it contains useful information.	2016-06-14 21:08:01 +02:00
ctk	Merge pull request #1293 from simonduq/pr/fix-warnings	2015-11-10 08:49:11 +01:00
dev	New radio interface parameters: Rx poll mode, last packet timestamp, last packet rssi, last packet lqi. Implementation of these parameters for cc2420, with, in addition, runtime configuration of CCA before Tx, auto-ack and frame filtering	2015-12-04 15:21:51 +01: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 'osd' into ico	2016-06-30 09:28:54 +02:00
sys	Merge pull request #1597 from rgrr/remove_static_from_process_c	2016-06-03 14:16:14 +02:00
contiki-default-conf.h	Simplified configuration of RPL non-storing mode	2016-06-08 14:03:21 +02: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