authmillenon e2c201f2e0 Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns ...

Conflicts:
	sys/net/destiny/in.h
	sys/net/destiny/socket.h
	sys/net/destiny/tcp.h
	sys/net/destiny/tcp_hc.c
	sys/net/destiny/tcp_hc.h
	sys/net/destiny/tcp_timer.c
	sys/net/destiny/udp.c
	sys/net/destiny/udp.h

2013-08-15 10:30:02 +02:00

..

doc

* import from old firekernel repository

2010-09-22 15:10:42 +02:00

gpioint

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

include

Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns

2013-08-15 10:30:02 +02:00

mci

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

rtc

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

tools

* import from old firekernel repository

2010-09-22 15:10:42 +02:00

asmfunc.s

Remove carriage returns

2013-08-15 10:17:15 +02:00

cpu.c

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

linkerscript.x

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

2013-04-22 09:56:07 +02:00

lpc23xx-iap.c

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

lpc2387-adc.c

fixed some includes

2013-07-24 00:44:28 +02:00

lpc2387-lpm.c

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

Makefile

* replaced new Makefile name in Makefiles

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

startup.s

* massive name changes

2010-10-28 11:29:03 +02:00