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

..

atomic.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

bitarithm.h

* updated copyright and license headers in various files

2013-06-18 17:21:38 +02:00

cib.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

clist.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

config.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

debug.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

flags.h

added one-time-initialization guard to transceiver

2013-06-24 22:12:57 +02:00

hwtimer_arch.h

* updated copyright and license headers in various files

2013-06-18 17:21:38 +02:00

hwtimer.h

* updated copyright and license headers in various files

2013-06-18 17:21:38 +02:00

io.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

irq.h

* fixed typo in readme

2013-02-27 20:22:19 +01:00

kernel_intern.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

kernel.h

* updated copyright and license headers in various files

2013-06-18 17:21:38 +02:00

lifo.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

lpm.h

* removed outdated (and probably confusing) FeuerWhere project as an author

2013-03-08 11:30:23 +01:00

msg.h

fixed coding style (space after most keywords)

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

mutex.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

oneway_malloc.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

queue.h

Merge branch 'wsn430'

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

sched.h

fixed doxygen value

2013-06-21 22:37:14 +02:00

tcb.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00

thread.h

fixed coding conventions (correctly this time)

2013-06-20 18:18:29 +02:00