Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: arangod/Utils/Collection.h		2012-11-15 13:59:54 +01:00
..
Actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2012-10-22 21:04:12 +08:00
Ahuacatl	changed function TRI_IsAllowedCollectionName	2012-11-14 14:09:00 +01:00
BitIndexes	various changes for windows	2012-10-22 20:51:31 +08:00
Documentation	issue #272: fixed typo	2012-11-07 16:53:36 +01:00
GeoIndex	…
HashIndex	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2012-10-20 22:37:25 +02:00
IndexIterators	…
IndexOperators	…
MRServer	upgraded to Doxygen 1.8.x	2012-10-18 16:38:20 +02:00
PriorityQueue	various changes for windows	2012-10-22 20:51:31 +08:00
RestHandler	transaction refactoring	2012-11-15 13:53:11 +01:00
RestServer	merge problems	2012-10-22 21:51:23 +08:00
SkipLists	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2012-10-22 21:04:12 +08:00
Utils	transaction refactoring	2012-11-15 13:53:11 +01:00
V8Server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2012-11-15 13:59:54 +01:00
VocBase	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2012-11-15 13:59:54 +01:00
Makefile.files	introduced additional transaction type for import	2012-11-15 09:52:47 +01:00