projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9a7ac8 862e488)
Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 2 Dec 2017 21:34:21 +0000 (22:34 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sat, 2 Dec 2017 21:34:21 +0000 (22:34 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/include/gnunet_crypto_lib.h patch | diff1 | diff2 | blob | history

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