Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB ... Conflicts: arangod/Ahuacatl/ahuacatl-grammar.c		2012-06-13 11:40:35 +02:00
..
Actions	fixed queue handling for MRuby, added mount for MRuby and mr_action_t	2012-06-09 11:15:18 +02:00
Ahuacatl	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-06-13 11:40:35 +02:00
GeoIndex	the great rename	2012-06-08 15:01:25 +02:00
HashIndex	the great rename	2012-06-08 15:01:25 +02:00
MRServer	very rudimentary execute action method	2012-06-10 00:15:49 +02:00
PriorityQueue	the great rename	2012-06-08 15:01:25 +02:00
RestHandler	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-06-08 15:57:33 +02:00
RestServer	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-06-13 11:40:35 +02:00
SkipLists	Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel	2012-06-08 15:13:01 +02:00
V8Server	optimiser change: collections are annotated with hints on how they are accessed. this info is picked up by the explain command	2012-06-12 16:50:36 +02:00
VocBase	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-06-13 11:40:35 +02:00
Makefile.files	Merge branch 'devel' of github.com:triAGENS/ArangoDB	2012-06-13 11:40:35 +02:00