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 |
|
Milan Babel
|
df13d9e0fc
|
Merge branch 'master' of github.com:overflowed/RIOT
Conflicts:
drivers/cc110x_ng/Makefile
|
2013-06-06 08:41:30 +02:00 |
|
Milan Babel
|
edb34b73c0
|
fixes for the wsn430
fixed vtimer for the msp430
added spi module for the wsn430 v1.3b
changed some variables to uintXX_t, fixes overflow on msp430
|
2013-06-06 08:35:17 +02:00 |
|
Ludwig Ortmann
|
671cb6560f
|
native cc110x_ng placebo
|
2013-03-21 17:08:41 +01:00 |
|
Oliver Hahm
|
7a4dec1830
|
* replaced new Makefile name in Makefiles
|
2013-03-09 23:47:21 +01:00 |
|
Oliver Hahm
|
5ffe5a9c27
|
* renamed makefiles to Makefile
|
2013-03-09 23:45:56 +01:00 |
|