James 0646a5a98e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or ... Conflicts: CHANGELOG arangod/Aql/ExecutionBlock.cpp arangod/Aql/OptimizerRules.cpp arangod/Aql/grammar.cpp js/server/tests/aql-optimizer-indexes.js		2014-12-02 10:42:04 +00:00
..
Books	Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or	2014-12-02 10:42:04 +00:00
Examples	Fixed a few spelling and code erros and deleted last examples	2014-07-02 17:48:54 +02:00
Scripts	Implement tastks REST api	2014-11-11 12:39:09 +01:00
man	…
man1	…
man8	…
Makefile.files	m4 cleanup	2014-10-29 20:36:56 +01:00
arangodb.css	…