Oreste Panaia f93eef34d7 git ... Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel Conflicts: lib/ShapedJson/json-shaper.c		2012-09-10 20:53:41 +08:00
..
actions/system	Merge https://github.com/triAGENS/ArangoDB into devel	2012-09-10 20:42:48 +08:00
client	added limited AQL support for bit indexes	2012-09-10 20:42:14 +08:00
common	Merge branch 'graph_algorithms' into devel	2012-09-04 09:41:03 +02:00
server	git	2012-09-10 20:53:41 +08:00
Makefile.javascript	changes to allow SUBDIR build	2012-08-30 18:06:23 +02:00