1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
RIOT/sys
Oliver Hahm 57cc002c67 Merge branch 'wsn430'
Conflicts:
	core/include/queue.h
	core/queue.c
	cpu/msp430-common/hwtimer_cpu.c
	cpu/msp430x16x/hwtimer_msp430.c
	sys/lib/hashtable.c
	sys/net/ieee802154/ieee802154_frame.c
	sys/shell/commands/sc_cc110x_ng.c
	sys/transceiver/transceiver.c
	sys/vtimer/vtimer.c
2013-06-25 15:33:40 +02:00
..
auto_init coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
config coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
include coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
lib Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00
logd fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
net Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00
ping fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
posix coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
ps fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
shell Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00
syslog fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
timex fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
tracelog fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
transceiver Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00
uart0 coding conventions for most of system libraries 2013-06-22 05:11:53 +02:00
vtimer Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00
chardev_thread.c fixed coding style (space after most keywords) 2013-06-24 22:37:35 +02:00
Makefile Merge branch 'wsn430' 2013-06-25 15:33:40 +02:00