Oliver Schmidt 35becbbcb5 Merge remote-tracking branch 'upstream/master' ... Conflicts: core/net/ip/uip-nameserver.c		2015-06-14 16:33:23 +02:00
..
cfs	Remove redundant assignment	2015-05-20 15:37:32 +05:30
ctk	Fix warnings caused by unescaped special doxygen chars	2015-02-15 20:11:09 +01:00
dev	CC2538: added support for SSI1	2015-05-18 10:02:55 +02:00
lib	Move MAX, MIN and ABS to sys/cc.h	2015-05-18 08:53:17 +02:00
loader	[doc] Give files a common structure by placing license first (partial)	2014-11-10 23:54:49 +01:00
net	Merge remote-tracking branch 'upstream/master'	2015-06-14 16:33:23 +02:00
sys	Merge pull request #883 from cmorty/pull/global-macros	2015-05-18 21:33:00 +02:00
contiki-default-conf.h	Network layer configuration: replace UIP_CONF_* with NETSTACK_CONF_WITH_*	2014-12-01 21:02:57 +01:00
contiki-lib.h
contiki-net.h	Add standardized nameserver pool	2015-01-09 09:44:06 +01:00
contiki-version.h
contiki.h