X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hb=3eb26862c3e82f9332c75c9c560f1044f80bc778;hp=90a085f8fde5a977dfdb1a13d6e8d0f62989864e;hpb=9ab36093bff474786e1672c30a72313b5506b0d0;p=idzebra-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index 90a085f..ee72b28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,33 @@
+<<<<<<< CHANGELOG
+--- 1.0a7 1997/5/16
+
+Fixed buffer-size problem in indexing.
+
+Added compression to temporary files for updating.
+
+Added phrase registers.
+
+Added dynamic mapping of search attribute to multiple termlists (ANY).
+
+||||||| 1.18
+=======
+Scan support in multiple databases/registers.
+
+>>>>>>> /tmp/T4a11432
+Configuration settings are case-insensitive and single dash (-)
+characters are ignored in comparisons.
+
+The index processing ignores empty files - warning given.
+
+New option to zebraidx (-V) displays version information.
+
+--- 1.0a6 1996/2/24
+
+Fixed problem in file-update system.
+
+Fixed problem in shadow system; register was sometimes corrupted after
+a commit operation.
+
 --- 1.0a5 1996/2/10
 
 Fixed problems in the ISAM subsystem. Caused difficulties when updating