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

..

destiny

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

ieee802154

Merge branch 'wsn430'

2013-06-25 15:33:40 +02:00

mm

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

net_help

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

protocol-multiplex

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

sixlowpan

Merge branch 'rpl' of ssh://ukleos.org:2222/home/git/ukleos

2013-06-28 17:53:21 +02:00