]> git.meshlink.io Git - meshlink/commitdiff
projects / meshlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afa1209 c3942de)
Merge branch 'discovery' into everbase
authorNiklas Hofmann <niklas.hofmann@everbase.net>
Fri, 8 Aug 2014 14:12:41 +0000 (16:12 +0200)
committerNiklas Hofmann <niklas.hofmann@everbase.net>
Fri, 8 Aug 2014 14:12:41 +0000 (16:12 +0200)
1  2 
src/meshlink.c patch | diff1 | diff2 | blob | history

diff --cc src/meshlink.c
Simple merge
MeshLink library, based on tinc 1.1