Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: arangod/RestServer/ArangoServer.cpp arangod/V8Server/ApplicationV8.cpp		2014-06-02 09:52:05 +02:00
..
errors.js	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-02 09:52:05 +02:00
module-console.js	coffee script fix	2014-03-20 19:36:42 +01:00
module-fs.js	fixed safeJoin (missing join)	2014-05-09 17:10:30 +02:00
module-internal.js	cleanup of version-check, added option check-version	2014-06-01 13:37:21 +02:00
modules.js	added applicationContext and foxxFilename	2014-05-09 17:12:55 +02:00
monkeypatches.js	fixed _shallowCopy, fixed creating of unknown attributes	2013-04-22 16:48:36 +02:00