projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 79e46d0)
Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
Conflicts:
NEWS
README
configure.in
src/net.c
src/net.h


No differences found
tinc, the VPN daemon