6 Commits

Author	SHA1	Message	Date
Jan Steemann	369433f1e2	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: arangosh/Benchmark/BenchmarkThread.h lib/SimpleHttpClient/SimpleHttpClient.cpp	2013-09-05 12:34:45 +02:00
Jan Steemann	0fc4d233a1	extended documentation on key generators	2013-03-28 16:56:27 +01:00
Frank Celler	fcecd3a15e	moved .dox to .md	2013-02-09 23:11:48 +01:00
Jan Steemann	adebe5429c	issue #383: updated documentation	2013-02-05 17:54:00 +01:00
Jan Steemann	77f3115ac7	updated documentation for document ids and keys	2012-11-29 10:20:10 +01:00
Frank Celler	da4534bdb0	fixed more links, moved Glossary to markdown	2012-11-23 13:34:44 +01:00