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

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

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

ieee802154

Merge branch 'wsn430'

2013-06-25 15:33:40 +02:00

net_help

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

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

protocol-multiplex

fix for #87, replacing - with _ in module protocol_multiplex

2013-08-04 03:17:31 +02:00

rpl

Don't note address operators as bit-wise and.

2013-08-14 16:30:40 +02:00

sixlowpan

Fixup for coding convention

2013-08-15 09:48:53 +02:00