update ChangeLog on gnunet-qr merger

diff --git a/ChangeLog b/ChangeLog
index ecffcf0c69f17c5e2781045f387f134d5c5f4a55..77f2cf0b893cda168757b5ca881c9e53fbcc96b2 100644 (file)
--- 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