Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 ... Conflicts: js/common/bootstrap/modules.js		2013-01-03 18:57:18 +01:00
..
ArangoServer.cpp	Merge remote-tracking branch 'origin/issue317' into 1.1	2013-01-03 18:57:18 +01:00
ArangoServer.h	windows fixes	2012-12-20 17:17:30 +08:00
arango.cpp	renamed execute/load to executelocal and executeglobal	2013-01-02 14:52:55 +01:00
arango.supp	the great rename	2012-06-08 15:01:25 +02:00