James 8bb501468f Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Aql/ExecutionNode.h		2014-08-14 10:51:49 +02:00
..
Actions	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
Ahuacatl	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
Aql	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-08-14 10:51:49 +02:00
BitIndexes	…
CapConstraint	…
Cluster	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
FulltextIndex	…
GeoIndex	…
HashIndex	…
IndexIterators	…
IndexOperators	…
Replication	…
RestHandler	Sort out TRI_CompareValuesJson to use UTF8 on demand.	2014-08-13 14:22:05 +02:00
RestServer	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
SkipLists	Use two shapers in TRI_CompareShapeTypes	2014-08-07 09:51:24 +02:00
Utils	much better exception handling	2014-08-06 18:37:37 +02:00
V8Server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
VocBase	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
Wal	…
CMakeLists.txt	moved AqlValue to its own file	2014-08-08 19:46:20 +02:00
Makefile.files	moved AqlValue to its own file	2014-08-08 19:46:20 +02:00