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

..

Makefile

Merge branch 'wsn430'

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

sc_cc110x_ng.c

Merge branch 'wsn430'

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

sc_cc1100.c

fixed coding style (space after most keywords)

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

sc_cc2420.c

added driver for cc2420

2013-06-06 08:35:17 +02:00

sc_disk.c

fixed coding style (space after most keywords)

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

sc_id.c

fixed coding style (space after most keywords)

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

sc_ltc4150.c

coding conventions for most of system libraries

2013-06-22 05:11:53 +02:00

sc_ps.c

coding conventions for most of system libraries

2013-06-22 05:11:53 +02:00

sc_rtc.c

fixed coding style (space after most keywords)

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

sc_sht11.c

fixed coding style (space after most keywords)

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

shell_commands.c

Merge branch 'wsn430'

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