1
0
Fork 0
Commit Graph

7 Commits

Author SHA1 Message Date
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
2012-12-18 13:37:34 +01:00
Frank Celler d05574fe01 added TOC generation 2012-12-03 17:27:25 +01:00
Jan Steemann 77f3115ac7 updated documentation for document ids and keys 2012-11-29 10:20:10 +01:00
Jan Steemann e4a473586a fixed documentation 2012-10-10 09:31:08 +02:00
Jan Steemann 9ef51c883f updated some documentation 2012-09-04 12:11:29 +02:00
Frank Celler c0774bb892 cleanup documentation 2012-08-16 11:24:24 +02:00
Frank Celler 5fbd731838 moved 2012-06-21 23:20:02 +02:00