Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: arangod/VocBase/document-collection.cpp arangod/VocBase/document-collection.h		2014-05-30 12:51:20 +02:00
..
ArangoServer.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-05-30 12:51:20 +02:00
ArangoServer.h	Remove many extern "C" declarations that are no longer needed.	2014-05-22 10:19:03 +02:00
ConsoleThread.cpp	fixed shutdown for busy V8 contexts	2014-05-30 11:39:11 +02:00
ConsoleThread.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-05-30 12:51:20 +02:00
VocbaseContext.cpp	Get rid of TRI_ENABLE_CLUSTER everywhere.	2014-05-21 14:46:47 +02:00
VocbaseContext.h	Remove many extern "C" declarations that are no longer needed.	2014-05-22 10:19:03 +02:00
arango.cpp	Seemingly fix behaviour on Windows.	2014-03-07 16:48:21 +01:00