1
0
Fork 0
arangodb/arangod
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1
Conflicts:
	js/common/bootstrap/modules.js
2013-01-03 18:57:18 +01:00
..
Actions windows fixes 2012-12-20 17:17:30 +08:00
Ahuacatl Merge remote-tracking branch 'origin/windows' into HEAD 2012-12-20 11:11:47 +01:00
BitIndexes windows fixes 2012-12-20 17:17:30 +08:00
Documentation backported documentation for issue #300 2012-12-22 03:41:03 +01:00
GeoIndex fixed some memory zone issues 2012-10-10 15:17:46 +02:00
HashIndex windows fixes 2012-12-20 17:17:30 +08:00
IndexIterators
IndexOperators draft index interface 2012-09-03 17:05:39 +08:00
MRServer windows fixes 2012-12-20 17:17:30 +08:00
PriorityQueue windows version 2012-12-06 20:44:01 +08:00
RestHandler backport of issue #300 2012-12-22 03:38:29 +01:00
RestServer Merge remote-tracking branch 'origin/issue317' into 1.1 2013-01-03 18:57:18 +01:00
SkipLists windows fixes 2012-12-20 17:17:30 +08:00
Utils renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
V8Server Merge remote-tracking branch 'origin/issue317' into 1.1 2013-01-03 18:57:18 +01:00
VocBase reduce memory usage for small collections 2013-01-03 11:25:28 +01:00
Makefile.files no longer used 2012-10-11 19:58:31 +02:00