From e96ba10771f6c6932607624c4645cf50b3d5b71f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 3 Apr 2019 13:55:45 +0200
Subject: update ChangeLog on gnunet-qr merger

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

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
 
-- 
cgit v1.2.3