jsteemann 1efc83babf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk		2016-03-23 23:48:27 +01:00
..
ArangoServer.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-23 23:48:27 +01:00
ArangoServer.h	…
ConsoleThread.cpp	…
ConsoleThread.h	…
VocbaseContext.cpp	…
VocbaseContext.h	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-23 19:01:19 +01:00
WindowsServiceUtils.cpp	…
arangod.cpp	…
arangod_libarangod_a-ArangoServer.o-61d1e2e3	…