Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/V8Server/v8-vocbase.cpp		2014-08-15 18:47:18 +02:00
..
actions	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-08-11 12:43:47 +02:00
apps/system	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-15 18:47:18 +02:00
client	jslint	2014-08-06 13:50:21 +02:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-15 18:47:18 +02:00
node	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
server	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-15 18:47:18 +02:00
GUIDELINES.md	…
Makefile.files	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00