projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cb90c7 f279824)
Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 25 Jan 2017 12:51:39 +0000 (13:51 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 25 Jan 2017 12:51:39 +0000 (13:51 +0100)
1  2 
src/include/gnunet_protocols.h patch | diff1 | diff2 | blob | history

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