Ludwig Ortmann f669f9a05b Merge remote-tracking branch 'upstream/master' ... Conflicts: Makefile.dep		2013-04-08 17:43:39 +02:00
..
include	* renamed some struct members in cc110x driver to avoid naming conflicts with stm32f4discovery	2013-03-23 18:57:12 +01:00
spi	Merge branch 'master' of github.com:RIOT-OS/RIOT	2013-03-10 16:46:46 +01:00
cc110x-defaultSettings.c	* removed outdated (and probably confusing) FeuerWhere project as an author	2013-03-08 11:30:23 +01:00
cc110x-rx.c	* renamed some struct members in cc110x driver to avoid naming conflicts with stm32f4discovery	2013-03-23 18:57:12 +01:00
cc110x-tx.c	[board/chronos board/msb-430h board/msba2-common drivers/cc110x_ng sys/shell	2010-12-11 12:09:20 +01:00
cc110x.c	* renamed some struct members in cc110x driver to avoid naming conflicts with stm32f4discovery	2013-03-23 18:57:12 +01:00
Makefile	native cc110x_ng placebo	2013-03-21 17:08:41 +01:00