Merge branch 'master' into xlog

[dygraphs.git] / jsTestDriver.conf

diff --git a/jsTestDriver.conf b/jsTestDriver.conf
index 04f49da..e05fc7a 100644 (file)
--- a/jsTestDriver.conf
+++ b/jsTestDriver.conf
@@ -3,8 +3,6 @@ server: http://localhost:9876
 # This list needs to be kept in sync w/ the one in dygraph-dev.js
 # and the one in generate-combined.sh.
 load:
-  - strftime/strftime-min.js
-  - rgbcolor/rgbcolor.js
   - dashed-canvas.js
   - dygraph-layout.js
   - dygraph-canvas.js
@@ -28,3 +26,4 @@ load:
   - datahandler/bars-custom.js
   - datahandler/bars-fractions.js
   - auto_tests/tests/*.js
+  - auto_tests/lib/jquery-1.4.2.js