]> git.meshlink.io Git - meshlink/commitdiff
projects / meshlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bad176 1191935)
Merge branch 'master' into testing/invitations
authorSaverio Proto <zioproto@gmail.com>
Wed, 11 Jun 2014 17:58:53 +0000 (19:58 +0200)
committerSaverio Proto <zioproto@gmail.com>
Wed, 11 Jun 2014 17:58:53 +0000 (19:58 +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