Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: arangod/VocBase/document-collection.c arangosh/CMakeLists.txt js/apps/system/aardvark/test/karma/karma.conf.js		2014-02-18 08:50:27 +01:00
..
jslint	cleanup of internal, fs, console	2013-03-31 00:10:48 +01:00
jsunity	Updated JSUnity, now equalitycheck for objects does not care for ordering anymore	2014-01-02 18:05:21 +01:00
org	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
test3	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
backbone.js	Foxx: Introducing Model	2013-04-04 11:17:22 +02:00
engine	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
jslint.js	fixed wrong call to length	2013-04-03 16:31:53 +02:00
jsunity.js	cleanup of internal, fs, console	2013-03-31 00:10:48 +01:00
test.json	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
test2.js	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
util.js	added coffee-script	2013-04-21 22:57:19 +02:00