Andreas Streichardt a2b8bb92f2 Oops...still conflicted		2016-04-04 15:45:30 +02:00
..
Actions	splitted HttpResponse.h	2016-04-01 10:39:38 +02:00
Agency	Oops...still conflicted	2016-04-04 15:45:30 +02:00
ApplicationServer	…
Aql	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2016-04-01 10:39:50 +02:00
Cluster	Merge branch 'devel' of github.com:arangodb/arangodb into agency	2016-04-04 13:36:22 +02:00
Dispatcher	…
FulltextIndex	…
GeoIndex	…
HttpServer	splitted HttpResponse.h	2016-04-01 10:39:38 +02:00
IndexOperators	…
Indexes	…
Replication	MSVC fixes	2016-03-31 14:01:23 +02:00
Rest	…
RestHandler	ttl overwrite	2016-04-01 15:10:20 +02:00
RestServer	Merge branch 'devel' of github.com:arangodb/arangodb into agency	2016-04-04 13:36:22 +02:00
Scheduler	splitted HttpResponse.h	2016-04-01 10:39:38 +02:00
Statistics	splitted HttpRequest into GeneralRequest/HttpRequest	2016-03-31 11:45:21 +02:00
Storage	…
Utils	splitted HttpResponse.h	2016-04-01 10:39:38 +02:00
V8Server	fixed some issues with tests	2016-04-04 10:47:04 +02:00
VocBase	splitted HttpResponse.h	2016-04-01 10:39:38 +02:00
Wal	…
CMakeLists.txt	…