projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6755fe 6bcc73a)
Merge remote-tracking branch 'origin/master' into identity_abe
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 3 Aug 2017 10:21:28 +0000 (19:21 +0900)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 3 Aug 2017 10:21:28 +0000 (19:21 +0900)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/util/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/util/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.