1
0
Fork 0
arangodb/arangod/V8Server
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
..
ApplicationV8.cpp Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-10 17:41:52 +01:00
ApplicationV8.h added initialised() method 2014-01-07 17:50:52 +01:00
v8-actions.cpp Rename a function from *sharding* to *cluster* 2014-01-31 16:04:15 +01:00
v8-actions.h updated disclaimer 2013-03-13 17:03:18 +01:00
v8-query.cpp fixed failing tests 2014-01-30 23:12:40 +01:00
v8-query.h updated disclaimer 2013-03-13 17:03:18 +01:00
v8-vocbase.cpp Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-06 13:18:52 +01:00
v8-vocbase.h removed unused resolver 2013-11-05 10:52:00 +01:00