Jan Steemann 9e47f3ca27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: arangod/Aql/ExecutionNode.h		2014-09-26 20:23:52 +02:00
..
actions	fixed API description	2014-09-26 16:44:41 +02:00
apps/system	Implement getSome for RemoteBlock.	2014-09-26 16:19:25 +02:00
client	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-09-22 09:30:58 +02:00
common	Implement getSome for RemoteBlock.	2014-09-26 16:19:25 +02:00
node	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-09-15 09:51:04 +02:00
server	differentiate between ABORT/TERMINATED/other	2014-09-26 15:53:22 +02:00
.jshintrc	Enabled unused: true, ported aardvark jslint to jshint.	2014-09-02 22:18:18 +02:00
GUIDELINES.md	…
Makefile.files	added jshint target	2014-09-10 11:46:11 +02:00