Jan Steemann ec2b866200 Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes ... Conflicts: js/apps/system/aardvark/frontend/js/templates/documentsView.ejs		2015-02-11 17:53:23 +01:00
..
Admin	arangod/Aql/Expression.cpp	2015-01-29 15:21:14 +01:00
ApplicationServer	avoid duplicate fatal output	2015-01-29 17:09:47 +01:00
Basics	Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes	2015-02-11 17:53:23 +01:00
Dispatcher	arangod/Aql/Expression.cpp	2015-01-29 15:21:14 +01:00
Documentation	…
GeneralServer	Squashed commit of the following: organise locking in distributed AQL	2014-12-22 14:40:22 +01:00
HttpServer	arangod/Aql/Expression.cpp	2015-01-29 15:21:14 +01:00
JsonParser	added derived file	2015-01-29 13:06:12 +01:00
MRuby	the great rename: array => object, list => array	2014-12-18 21:07:06 +01:00
ProgramOptions	issue #1086: arangoimp: Odd errors if arguments are not given properly	2014-11-06 12:07:12 +01:00
Rest	do not warn when returning an unknown HTTP status code	2015-02-11 12:46:16 +01:00
Scheduler	arangod/Aql/Expression.cpp	2015-01-29 15:21:14 +01:00
ShapedJson	code simplification	2015-01-24 14:02:48 +01:00
SimpleHttpClient	More work on getting smart error messages.	2015-02-02 17:55:13 +01:00
Statistics	Fixed statistics for FreeBSD	2014-11-26 16:57:40 +01:00
Utilities	…
V8	added stack traces for ArangoError	2015-02-03 17:45:08 +01:00
Zip	…
CMakeLists.txt	removed unused file	2014-12-16 17:30:48 +01:00
Makefile.files	removed unused file	2014-12-16 17:30:48 +01:00
Makefile.flex	…