Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: Documentation/Books/Users/Aql/README.mdpp Documentation/Books/Users/AqlExtending/README.mdpp		2014-08-05 15:09:28 +02:00
..
actions	Take out a cout.	2014-08-01 17:06:57 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-05 15:09:28 +02:00
client	Implement distributeShardsLike	2014-08-01 17:05:04 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2014-08-05 10:13:03 +02:00
node	…
server	…
GUIDELINES.md	…
Makefile.files	…