Frank Celler d461356c67 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 ... Conflicts: CHANGELOG Documentation/Makefile.files VERSION arangod/Documentation/api-graph.dox arangod/Documentation/api-simple.dox arangod/Documentation/aql.dox arangod/Documentation/implementor-manual.dox arangod/Documentation/index-cap.dox arangod/Documentation/index-fulltext.dox arangod/Documentation/index-geo.dox arangod/Documentation/index-hash.dox arangod/Documentation/index-skiplist.dox build_posix.h configure.ac js/common/tests/shell-database.js		2013-02-10 16:22:55 +01:00
..
bootstrap	moved .dox to .md	2013-02-09 13:15:28 +01:00
modules	fixed issue #350: XMLMISSING in wiki references	2013-02-10 16:11:35 +01:00
test-data	Removed some unnecessary files	2012-08-15 00:55:25 +02:00
tests	changed version number to 1.3.alpha	2013-02-06 10:22:58 +01:00