]> git.meshlink.io Git - meshlink/commit - src/net_socket.c
Merge branch 'master' into 1.1
authorSven-Haegar Koch <haegar@sdinet.de>
Fri, 26 Mar 2010 15:51:03 +0000 (16:51 +0100)
committerSven-Haegar Koch <haegar@sdinet.de>
Fri, 26 Mar 2010 15:51:03 +0000 (16:51 +0100)
commit103543aa2c15d9f1e2aa313a2e593a7524cce484
tree3917fa9351d7da99862950c8f264a4c47ce4d42e
parent35b1c25093a478d20e01f0ff391c9cdc9c41c2b8
parent292354912f346fe467f557f0dc026b519997289c
Merge branch 'master' into 1.1

Conflicts:
NEWS
README
configure.in
have.h
src/conf.c
src/conf.h
src/net.c
src/net_packet.c
src/protocol_key.c
src/protocol_subnet.c
src/route.c
src/tincd.c
22 files changed:
NEWS
README
doc/tinc.texi
have.h
src/conf.c
src/connection.c
src/connection.h
src/graph.c
src/net.c
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.h
src/protocol.c
src/protocol.h
src/protocol_auth.c
src/protocol_key.c
src/protocol_subnet.c
src/route.c
src/route.h
src/subnet.c
src/tincd.c