Commit Graph

7 Commits (5d2bc0fa3a7d29d292ca4de2ccdf3acb6887c943)

Author SHA1 Message Date
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
10 years ago
Milan Babel 2f5ed66756 created own module for ieee802154
this is needed to include the ieee802154 in drivers without the hole sixlowpan
10 years ago
Martin Lenders 07e8ac9c19 Remove swtimer
see #4
10 years ago
Oliver Hahm e6177e811a * moved cpu and board specific parts to corresponding Makefiles
* introduced variable for cpu folder
10 years ago
Benjamin Valentin 4d73d17662 add Makefiles to sys/net 10 years ago
Oliver Hahm 7a4dec1830 * replaced new Makefile name in Makefiles 10 years ago
Oliver Hahm 5ffe5a9c27 * renamed makefiles to Makefile 10 years ago