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
..
destiny.c	Refactor ip.h	2013-08-14 04:04:13 +02:00
destiny.h	Remove carriage returns	2013-08-15 10:17:15 +02:00
in.h	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
Makefile	Set up new directory structure	2013-08-14 00:33:11 +02:00
socket.c	Refactor ip.h	2013-08-14 04:04:13 +02:00
socket.h	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
tcp_hc.c	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
tcp_hc.h	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
tcp_timer.c	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
tcp_timer.h	Remove carriage returns	2013-08-15 10:17:15 +02:00
tcp.c	Set up new directory structure	2013-08-14 00:33:11 +02:00
tcp.h	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
udp.c	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00
udp.h	Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns	2013-08-15 10:30:02 +02:00