today's changes

diff --git a/ChangeLog b/ChangeLog
index f090436c4cdd35be634a000f1949edd1c8b3e3e3..5751da879e96beadfa014d5e6ebae8390edd39b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-14  15:12  Christos Zoulas <christos@zoulas.com>
+
+       * prevent mime entries from being attached to magic
+         entries with no descriptions
+
+       * adjust magic strength for regex type
+
+       * remove superfluous ascmagic with encoding test
+
 2014-03-06  12:01  Christos Zoulas <christos@zoulas.com>
 
        * fix regression fix echo -ne "\012\013\014" | file -i -