X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hb=7247993b5d35aa9c8f249f6340bc59d87a1f08cd;hp=215b73a420ee169eaa56b959771b15b9faedcaed;hpb=fbf310e3816958482b62a453b8215eaf3398ba3c;p=idzebra-moved-to-github.git

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