]> git.meshlink.io Git - meshlink/commit
Merge branch 'discovery' into everbase
authorNiklas Hofmann <niklas.hofmann@everbase.net>
Fri, 8 Aug 2014 12:32:03 +0000 (14:32 +0200)
committerNiklas Hofmann <niklas.hofmann@everbase.net>
Fri, 8 Aug 2014 12:32:03 +0000 (14:32 +0200)
commit6d1ac53f5c34ece4c7a82efb432a8e1d81fcff0d
tree916b99c411915f7cf8de7a6f160cac5f8b210ed8
parentdd19f86d9a5ceb2902239ba92cf669161a2c4477
parent130b8c0b637619beaf65a9e00618c51f383451e8
Merge branch 'discovery' into everbase

Conflicts:
examples/chatpp.cc
src/meshlink++.h
src/meshlink.c
examples/chat.c
examples/chatpp.cc
examples/manynodes.c
src/discovery.c
src/meshlink++.h
src/meshlink.c
src/meshlink.h
src/meshlink_internal.h