[GNUnet-SVN] [gnunet] branch master updated: update ChangeLog on gnunet-qr merger

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new e96ba1077 update ChangeLog on gnunet-qr merger
e96ba1077 is described below

commit e96ba10771f6c6932607624c4645cf50b3d5b71f
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Apr 3 13:55:45 2019 +0200

    update ChangeLog on gnunet-qr merger
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ecffcf0c6..77f2cf0b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed 03 Apr 2019 01:54:44 PM CEST
+  Merged gnunet-qr-c-2 branch, replacing Python-based implementation
+  of gnunet-qr with C-based implementation that also integrates
+  gnunet-uri. -HG/MS/CG
+
 Wed 03 Apr 2019 01:15:57 PM CEST
   Fixed a few test case regressions (GNS, FS). -CG
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden