Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel ... Conflicts: arangosh/V8Client/arangosh.cpp bin/arango32.msi bin/arango64.msi lib/BasicsC/win-utils.c		2013-01-15 15:50:47 +01:00
..
ArangoServer.cpp	added show marker info	2013-01-14 02:20:06 +01:00
ArangoServer.h	windows fixes	2012-12-20 17:17:30 +08:00
arango.cpp	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-15 15:50:47 +01:00
arango.supp	the great rename	2012-06-08 15:01:25 +02:00