Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB ... Conflicts: arangod/RestServer/ArangoServer.cpp arangosh/ArangoShell/ArangoClient.cpp js/client/js-client.h		2012-10-13 16:28:09 +02:00
..
ArangoServer.cpp	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-10-13 16:28:09 +02:00
ArangoServer.h	removed --enable-ssl configure option	2012-10-10 14:55:18 +02:00
arango.cpp	fixed version number, added arangosh chapter	2012-08-03 10:22:09 +02:00
arango.supp	the great rename	2012-06-08 15:01:25 +02:00