]> git.meshlink.io Git - meshlink/commit
projects / meshlink / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62b61a1 00e71ec)
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Tue, 26 Jun 2012 11:24:20 +0000 (13:24 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 26 Jun 2012 11:24:20 +0000 (13:24 +0200)
commit19be9cf7150858311f7898fa3fb525d692d02f64
tree1847e05d63548c6a81a7ee32e1fbef58ee9fcc8etree | snapshot
parent62b61a1b7c2382b1bade142b3a41a9b27c1fd40dcommit | diff
parent00e71ece25070dc919f9bc0696e4ff3a387360d0commit | diff
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
README
configure.in
lib/utils.c
src/linux/device.c
src/meta.c
src/net.h
src/net_setup.c
src/net_socket.c
src/protocol.c
src/protocol_auth.c
src/tincd.c
16 files changed:
NEWS diff1 | diff2 | blob | history
THANKS diff1 | diff2 | blob | history
doc/tinc.conf.5.in diff1 | diff2 | blob | history
doc/tinc.texi diff1 | diff2 | blob | history
have.h diff1 | diff2 | blob | history
src/meta.c diff1 | diff2 | blob | history
src/net.h diff1 | diff2 | blob | history
src/net_packet.c diff1 | diff2 | blob | history
src/net_setup.c diff1 | diff2 | blob | history
src/net_socket.c diff1 | diff2 | blob | history
src/netutl.c diff1 | diff2 | blob | history
src/protocol.c diff1 | diff2 | blob | history
src/protocol_auth.c diff1 | diff2 | blob | history
src/route.c diff1 | diff2 | blob | history
src/route.h diff1 | diff2 | blob | history
src/utils.c diff1 | | blob | history
MeshLink library, based on tinc 1.1