projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
33f241d
)
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 6 Jun 2011 18:42:15 +0000
(20:42 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 6 Jun 2011 18:42:15 +0000
(20:42 +0200)
Conflicts:
NEWS
configure.in
doc/tincd.8.in
lib/pidfile.c
lib/pidfile.h
lib/xalloc.h
lib/xmalloc.c
src/conf.c
src/conf.h
src/connection.c
src/connection.h
src/event.c
src/graph.c
src/graph.h
src/net.c
src/net.h
src/node.h
src/openssl/crypto.c
src/process.c
src/protocol.c
src/protocol_key.c
src/route.c
No differences found