Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/V8Server/v8-vocbase.cpp		2014-08-15 18:47:18 +02:00
..
ApplicationV8.cpp	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
ApplicationV8.h	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
V8Job.cpp	…
V8Job.h	…
V8PeriodicTask.cpp	…
V8PeriodicTask.h	…
V8TimerTask.cpp	…
V8TimerTask.h	…
v8-actions.cpp	new upgrade-database (formely known as version-check) and new startup procedure	2014-08-07 14:12:19 +02:00
v8-actions.h	…
v8-collection-util.cpp	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-collection.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-15 18:47:18 +02:00
v8-collection.h	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-query.cpp	v8-vocbase split: clean up includes.	2014-08-07 11:55:22 +02:00
v8-query.h	…
v8-replication.cpp	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-replication.h	v8-vocbase split: clean up includes	2014-08-07 16:17:40 +02:00
v8-util.cpp	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-vocbase.cpp	renamed variable	2014-08-15 18:12:58 +02:00
v8-vocbase.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-13 16:29:57 +02:00
v8-vocbaseprivate.h	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-voccursor.cpp	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-08-14 15:21:07 +02:00
v8-voccursor.h	Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2	2014-08-14 15:21:07 +02:00
v8-vocindex.cpp	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-15 18:47:18 +02:00
v8-vocindex.h	v8-vocbase split: clean up includes	2014-08-07 16:17:40 +02:00
v8-wrapshapedjson.cpp	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00
v8-wrapshapedjson.h	Cleanup: killall tabs.	2014-08-14 13:17:21 +02:00