[Pspp-cvs] Changes to pspp/src/ChangeLog

[Ben Pfaff]

Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.125 pspp/src/ChangeLog:1.126
--- pspp/src/ChangeLog:1.125    Wed Jan  5 14:45:54 2005
+++ pspp/src/ChangeLog  Thu Jan  6 05:29:46 2005
@@ -1,3 +1,10 @@
+Wed Jan  5 21:23:31 2005  Ben Pfaff  <address@hidden>
+
+       * sort.c: (merge) Fix assertion for proper Huffman merge pattern:
+       0 == 1 modulo 1.  See Knuth 5.4.9 (vol. 3, 2nd ed.,
+       pp. 361).  Thanks to John Darrington <address@hidden> for
+       reporting the bug.
+
 Wed Jan  5 22:42:26 WST 2005 John Darrington <address@hidden>
 
        * case.h Fixed bug # 11307
@@ -159,7 +166,6 @@
 
        * permissions.c command.def Added the PERMISSIONS command
 
->>>>>>> 1.110
 Mon Nov 15 01:33:32 2004  Ben Pfaff  <address@hidden>
 
        * q2c.c: (dump_header) Don't try to emit #includes at very top of
@@ -386,7 +392,6 @@
        (var_dtor_free) New function.
        (discard_variables) Use NULL instead of inline_file.
 
->>>>>>> 1.106
 Fri Nov 12 10:07:11 WST 2004 John Darrington <address@hidden>
 
        * value-labs.c  Fixed the implmentation of value_to_string, so