X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=ee72b28fc3c9a81469055b432045fc00858e0009;hb=e1f85310e64f96f4f4878b36e313786b8c63a512;hp=a74effe42d23108c2290cb6d6aa9d550e619b2ed;hpb=276a6af7f9d8ef0ef2ffc3f25e639be148ca2c7c;p=idzebra-moved-to-github.git

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