Frank Celler 478b952d27 Merge branch 'devel' of github.com:triAGENS/AvocadoDB ... Conflicts: Makefile.in Makefile.unittests V8/v8-vocbase.cpp		2012-04-26 23:27:18 +02:00
..
actions	renamed functions, moved from old query language to new one	2012-04-26 17:44:57 +02:00
client	renamed functions, moved from old query language to new one	2012-04-26 17:44:57 +02:00
common	more memory zones	2012-04-26 17:43:37 +02:00
server	some more cleanup	2012-04-26 18:54:59 +02:00