projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7356e4f 1583915)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 1 Dec 2016 16:05:29 +0000 (17:05 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 1 Dec 2016 16:05:29 +0000 (17:05 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/include/gnunet_protocols.h patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/include/gnunet_protocols.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.