Oliver Hahm bf85e4902c Merge branch 'rpl' of ssh://ukleos.org:2222/home/git/ukleos ... Conflicts: board/msba2-common/tools/src/control_2xxx.c drivers/cc110x/cc1100-interface.h projects/test_rpl/main.c sys/include/vtimer.h sys/net/sixlowpan/rpl/Jamfile sys/net/sixlowpan/rpl/objective_functions.c sys/net/sixlowpan/rpl/objective_functions.h sys/net/sixlowpan/rpl/of0.c sys/net/sixlowpan/rpl/of0.h sys/net/sixlowpan/rpl/rpl.c sys/net/sixlowpan/rpl/rpl_dodag.c sys/net/sixlowpan/rpl/rpl_structs.h sys/net/sixlowpan/rpl/trickle.c sys/net/sixlowpan/sixlowmac.c sys/vtimer/vtimer.c		2013-06-28 17:53:21 +02:00
..
arch_cc1100.h	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc1100_phy.c	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
cc1100_phy.h	coding conventions for drivers	2013-06-21 22:36:48 +02:00
cc1100_spi.c	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
cc1100_spi.h	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc1100-csmaca-mac.c	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
cc1100-csmaca-mac.h	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc1100-defaultSettings.c	coding conventions for drivers	2013-06-21 22:36:48 +02:00
cc1100-defaultSettings.h	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc1100-interface.h	Merge branch 'rpl' of ssh://ukleos.org:2222/home/git/ukleos	2013-06-28 17:53:21 +02:00
cc1100-internal.h	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc1100.c	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
cc1100.h	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
Makefile	add Makefiles to sys/net	2013-03-16 17:27:27 +01:00