Ludwig Ortmann f669f9a05b Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	Makefile.dep

2013-04-08 17:43:39 +02:00

..

cc110x

* renamed some struct members in cc110x driver to avoid naming conflicts with stm32f4discovery

2013-03-23 18:57:12 +01:00

cc110x_ng

Merge remote-tracking branch 'upstream/master'

2013-04-08 17:43:39 +02:00

include

add native cpu doxygen documentation,

2013-03-13 21:56:56 +01:00

ltc4150

Merge branch 'master' of github.com:RIOT-OS/RIOT

2013-03-10 16:46:46 +01:00

sht11

Merge branch 'master' of github.com:RIOT-OS/RIOT

2013-03-10 16:46:46 +01:00

Makefile

* replaced new Makefile name in Makefiles

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