Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: arangosh/V8Client/arangosh.cpp		2014-02-26 21:34:34 +01:00
..
actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
apps/system/aardvark	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
client	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
devs/databases/_system	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
node	removed unnessary files	2014-02-20 20:02:00 +01:00
server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-02-26 21:34:34 +01:00
GUIDELINES.md	…
Makefile.files	client tests	2014-02-26 20:07:37 +01:00