Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: lib/BasicsC/voc-errors.h		2014-08-22 21:51:38 +02:00
..
ArangoServer.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-22 21:51:38 +02:00
ArangoServer.h	small fixes	2014-07-08 00:31:48 +02:00
ConsoleThread.cpp	towards new dispatcher interface	2014-08-18 23:37:32 +02:00
ConsoleThread.h	updated disclaimer	2014-06-20 16:40:35 +02:00
VocbaseContext.cpp	updated disclaimer	2014-06-20 16:40:35 +02:00
VocbaseContext.h	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
arango.cpp	updated disclaimer	2014-06-20 16:40:35 +02:00