From 7cf4e149027f602723f729b8a3b8601833232021 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 2 Jan 1997 12:05:01 +0000 Subject: [PATCH] Merge. --- CHANGELOG | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1efb1b8..0e50351 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,8 @@ -<<<<<<< CHANGELOG -Reduced disk space for saved keys (storeKeys = 1). - -Added optional, physical ANY (key replication) -======= Bug fix: temporary result sets weren't deleted. Reduced disk space for saved keys (storeKeys = 1). ->>>>>>> 1.30 + +Added optional, physical ANY (key replication) Implemented proximity operator in search. -- 1.7.10.4