projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[idzebra-moved-to-github.git]
/
CHANGELOG
diff --git
a/CHANGELOG
b/CHANGELOG
index
1efb1b8
..
0e50351
100644
(file)
--- 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).
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.
Implemented proximity operator in search.