Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel ... Conflicts: CHANGELOG Makefile.in arangod/V8Server/ApplicationV8.cpp arangod/V8Server/v8-vocbase.cpp html/admin/js/master.js js/actions/system/api-collection.js js/common/bootstrap/errors.js js/server/version-check.js lib/BasicsC/errors.dat lib/BasicsC/logging.c lib/BasicsC/voc-errors.c lib/BasicsC/voc-errors.h		2013-01-05 11:16:50 +01:00
..
LineEditor.cpp	replaced new/delete with stack objects	2012-10-16 00:27:02 +02:00
LineEditor.h	replaced new/delete with stack objects	2012-10-16 00:27:02 +02:00
ResourceHolder.h	ALL() moved to transaction semantics	2012-11-19 13:07:38 +01:00
ScriptLoader.cpp	updated error codes	2013-01-03 16:31:55 +01:00
ScriptLoader.h	windows fixes	2012-12-20 17:17:30 +08:00