1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63b2a01..5064b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 16-03-17  Cyrille Bagard <nocbos@gmail.com>
 
+	* tools/d2c/grammar.y:
+	Fix two reduce/reduce conflicts in d2c.
+
+16-03-17  Cyrille Bagard <nocbos@gmail.com>
+
 	* plugins/pychrysa/gtkext/viewpanel.c:
 	Update code.