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
..
cpu-conf.h	changed default stacksize	2013-08-14 18:04:25 +02:00
cpu.h	fixed coding conventions (mostly by astyle)	2013-06-21 03:52:57 +02:00
lpc23xx.h	Remove carriage returns	2013-08-15 10:17:15 +02:00
lpc2387-adc.h	* updated copyright and license headers in various files	2013-06-18 17:21:38 +02:00
lpc2387-rtc.h	fixed coding conventions (mostly by astyle)	2013-06-21 03:52:57 +02:00
lpc2387.h	[cpu/arm_common cpu/lpc2387]	2010-11-29 19:19:59 +01:00