Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: arangod/VocBase/voc-shaper.cpp		2014-06-06 17:00:49 +02:00
..
Legends.cpp	calculate lengths only once during dump()	2014-06-05 01:14:38 +02:00
Legends.h	Fixes to compile under Visual Studio.	2014-05-22 16:27:30 +02:00
json-shaper.cpp	TRI_ASSERT	2014-06-06 11:25:19 +02:00
json-shaper.h	use wal shape and attribute markers	2014-05-22 16:00:00 +02:00
shape-accessor.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-06 17:00:49 +02:00
shape-accessor.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-05 22:58:49 +02:00
shaped-json.cpp	TRI_ASSERT	2014-06-06 11:25:19 +02:00
shaped-json.h	Header cleanup: use #include "Basics/Common.h" in all C++ files.	2014-05-21 15:50:30 +02:00