Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding ... Conflicts: arangod/V8Server/V8PeriodicJob.cpp js/apps/system/aardvark/api-docs.json js/apps/system/aardvark/api-docs/batch.json js/apps/system/aardvark/api-docs/collection.json js/apps/system/aardvark/api-docs/cursor.json js/apps/system/aardvark/api-docs/database.json js/apps/system/aardvark/api-docs/document.json js/apps/system/aardvark/api-docs/edge.json js/apps/system/aardvark/api-docs/edges.json js/apps/system/aardvark/api-docs/endpoint.json js/apps/system/aardvark/api-docs/graph.json js/apps/system/aardvark/api-docs/index.json js/apps/system/aardvark/api-docs/job.json js/apps/system/aardvark/api-docs/replication.json js/apps/system/aardvark/api-docs/simple.json js/apps/system/aardvark/api-docs/system.json js/apps/system/aardvark/api-docs/traversal.json		2014-02-28 20:37:05 +01:00
..
Debian	removed old files	2014-02-27 13:16:54 +01:00
Linux	removed foxx-manager and arango-dfdb shell scripts, removed uid config file	2013-12-23 17:11:10 +01:00
MacOSX/Bundle	removed old files	2014-02-27 13:16:54 +01:00
Windows	only arango icons are exported in to installation directory	2014-02-28 18:27:53 +01:00
travisCI	put into separat scripts to hunt down travis problems	2014-02-17 16:12:29 +01:00
release.sh	…