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

* replaced new Makefile name in Makefiles

2013-03-09 23:47:21 +01:00

vtimer.c

Merge branch 'wsn430'

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