Jan Steemann 3bb251000c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: lib/V8/v8-utils.cpp		2013-03-26 14:13:41 +01:00
..
actions	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-03-26 14:13:41 +01:00
client	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2013-03-26 10:01:39 +01:00
common	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel	2013-03-26 14:13:41 +01:00
node-0.8.21/modules	added node modules	2013-03-06 11:40:43 +01:00
server	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2013-03-26 13:58:20 +01:00
GUIDELINES.md	…
Makefile.files	fixed jslint errors	2013-03-24 01:14:58 +01:00