Frank Celler a78768e9e6 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel ... Conflicts: CHANGELOG Makefile.in		2012-11-27 13:31:44 +01:00
..
Examples	…
Manual	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2012-11-27 12:37:41 +01:00
Scripts	…
UserManual	Merge remote-tracking branch 'origin/1.1' into devel	2012-11-27 12:34:58 +01:00
images	added web interface description	2012-11-25 20:19:31 +01:00
latex	…
man	…
man1	…
man8	…
Makefile.files	added more cleanup for 3rd party, see issue #269: fix make distclean & clean	2012-11-27 13:28:47 +01:00
arango.template.in	fixed more links, moved Glossary to markdown	2012-11-23 13:34:44 +01:00
arangodb.css	…
empty.html	…
footer.html	…
header.html	…