projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e7252 4cc09ba)
resolve merge conflict with peerinfo plugin move
authorChristian Grothoff <christian@grothoff.org>
Tue, 14 Aug 2018 09:17:30 +0000 (11:17 +0200)
committerChristian Grothoff <christian@grothoff.org>
Tue, 14 Aug 2018 09:17:30 +0000 (11:17 +0200)
1  2 
src/peerinfo-tool/Makefile.am patch | diff1 | diff2 | blob | history
src/peerinfo/Makefile.am patch | diff1 | diff2 | blob | history

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