projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
075e682
)
Merge branch 'master' into 1.1
author
Guus Sliepen
<guus@sliepen.eu.org>
Wed, 16 Sep 2009 17:55:47 +0000
(19:55 +0200)
committer
Guus Sliepen
<guus@sliepen.eu.org>
Wed, 16 Sep 2009 17:55:47 +0000
(19:55 +0200)
Conflicts:
have.h
lib/dropin.c
lib/fake-getaddrinfo.c
lib/pidfile.c
src/Makefile.am
src/bsd/device.c
src/conf.c
src/connection.c
src/connection.h
src/graph.c
src/mingw/device.c
src/net.c
src/net_setup.c
src/node.c
src/protocol_key.c
src/protocol_misc.c
src/tincd.c
No differences found