X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hp=1dcdcf9743505e209259346573c1c8e2bd1e6e24;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hpb=28bf032598869adec59c789eed6ff9bde6984b9b

diff --git a/CHANGELOG b/CHANGELOG
index 1dcdcf9..ee72b28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,28 @@
+<<<<<<< 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