Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 ... Conflicts: CHANGELOG Documentation/Manual/arangodb_1.2_shell_reference_card.pdf Makefile.in aclocal.m4 config/compile config/config.guess config/config.sub config/depcomp config/missing configure lib/JsonParser/json-parser.c		2013-02-21 14:21:59 +01:00
..
actions/system	issue #370: add documentation for reloadRouting and flushServerModules	2013-02-21 13:33:03 +01:00
client	added replaceByExample() and updateByExample() methods	2013-02-19 11:38:55 +01:00
common	Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2	2013-02-21 14:21:59 +01:00
server	clone routes so the underlying collection can be unloaded	2013-02-20 18:55:25 +01:00
GUIDELINES.md	fixed typos	2013-01-18 17:10:24 +01:00
Makefile.files	fixed gui	2013-02-02 16:09:15 +01:00