Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: arangod/Utils/Collection.h		2012-11-15 13:59:54 +01:00
..
actions/system	collection info struct changed	2012-11-15 11:24:35 +01:00
client	collection info struct changed	2012-11-15 11:24:35 +01:00
common	transaction refactoring	2012-11-15 13:53:11 +01:00
server	issue #271: simple paths() function optimisations	2012-10-26 13:32:01 +02:00
Makefile.files	removed generated files	2012-10-11 20:37:41 +02:00