Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: lib/ShapedJson/Legends.cpp lib/ShapedJson/Legends.h		2014-05-20 17:03:49 +02:00
..
bootstrap	Finish first version of JsonLegend, not activated in Makefile.	2014-05-20 13:27:57 +02:00
modules	fixed remove for vertexColelctions	2014-05-20 16:51:54 +02:00
test-data	added empty remark	2014-05-08 11:18:08 +02:00
tests	Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps	2014-05-20 16:22:44 +02:00