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
..
2013-08-14 18:04:25 +02:00
2013-08-15 10:17:15 +02:00
2010-11-29 19:19:59 +01:00