Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes ... Conflicts: arangod/VocBase/document-collection.c		2013-11-14 01:01:24 +01:00
..
GeoIndex.c	cleanup of indexes, fix for compaction (hash, cap, geo)	2013-03-11 09:49:58 +01:00
GeoIndex.h	cleanup of indexes, fix for compaction (hash, cap, geo)	2013-03-11 09:49:58 +01:00
geo-index.c	Merge remote-tracking branch 'origin/devel' into inline-shapes	2013-11-14 01:01:24 +01:00
geo-index.h	cleanup of indexes, fix for compaction (hash, cap, geo)	2013-03-11 09:49:58 +01:00