X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hb=e1f85310e64f96f4f4878b36e313786b8c63a512;hp=04e98a9282ed2c5367d90349f12c81cd572348fe;hpb=1952c5d35e4a44fbb75395055591fca8ac47ed66;p=idzebra-moved-to-github.git

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