Fixed arguments to nodetogr

[idzebra-moved-to-github.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index ee72b28..c0e48bc 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,16 @@
-<<<<<<< CHANGELOG
---- 1.0a7 1997/5/16
+Bug fix: result sets with ranked operands weren't sorted.
+
+Added SOIF support.
+
+--- 1.0a8 1996/6/6
+
+Added national character-handling subsystem.
+
+Various fixes.
+
+Small modifications to input filters and profiles.
+
+--- 1.0a7 1996/5/16
 
 Fixed buffer-size problem in indexing.
 
@@ -9,11 +20,8 @@ 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.