Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel ... Conflicts: CHANGELOG CMakeLists.txt GNUmakefile Makefile.in VERSION arangod/V8Server/ApplicationV8.cpp build.h configure configure.ac js/actions/api-foxx.js 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 lib/BasicsC/locks-win32.c		2014-01-16 08:53:31 +01:00
..
DbaManual	removed priority queues	2013-11-18 11:12:36 +01:00
Examples	merged changes from 1.4 back to devel	2013-12-27 14:59:23 +01:00
ImplementorManual	…
InstallationManual	fixed Doxygen errors	2014-01-15 18:15:22 +01:00
Manual	Merge commit '65b6417' into devel	2013-12-31 16:36:49 +01:00
RefManual	Fixed type modules -> _modules	2014-01-11 12:01:27 +01:00
Scripts	…
ToolsManual	…
UserManual	added extra notes about Foxx deployment	2013-12-04 23:49:14 +01:00
images	…
latex	removed version number from tex/pdf manual	2013-11-08 15:24:24 +01:00
man	…
man1	issue #695: arangosh server.password error	2013-12-02 13:13:51 +01:00
man8	issue #695: arangosh server.password error	2013-12-02 13:13:51 +01:00
KeyValue.md	…
Makefile.files	merged changes from 1.4 back to devel	2013-12-27 14:59:23 +01:00
arango.template.in	…
arangodb.css	new CSS from Claudius	2013-12-07 18:56:01 +01:00
empty.html	…
footer.html	…
header.html	…