Jan Steemann 687b2b128b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: arangod/Ahuacatl/ahuacatl-grammar.cpp		2014-06-02 16:31:55 +02:00
..
actions	Bug Fix in examples (make examples)	2014-06-02 12:06:33 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-02 09:52:05 +02:00
client	Fixed graph tests	2014-05-28 21:48:22 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-02 16:31:55 +02:00
node	updated node modules	2014-05-29 10:03:18 +02:00
server	cleanup of version-check, added option check-version	2014-06-01 13:37:21 +02:00
GUIDELINES.md	…
Makefile.files	…