aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-08-13 09:49:20 -0700
committerMisko Hevery2010-08-13 09:49:20 -0700
commit0bd7e4fe75bc02fa1cf67a0c66255db35bfbfe8f (patch)
tree78df893315f436ca43d36f6c6c4692e444d3e4f5
parent0c2dd09e781a144c65cd79a0a010f4ebcbd78f24 (diff)
parent84b3a1774edb1e12ba0076e32fe8928ba54a48e3 (diff)
downloadangular.js-0bd7e4fe75bc02fa1cf67a0c66255db35bfbfe8f.tar.bz2
Merge branch 'master' of github.com:angular/angular.js
-rw-r--r--jsTestDriver-jquery.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/jsTestDriver-jquery.conf b/jsTestDriver-jquery.conf
index e5dac727..ed58d269 100644
--- a/jsTestDriver-jquery.conf
+++ b/jsTestDriver-jquery.conf
@@ -8,9 +8,9 @@ load:
- src/Angular.js
- src/JSON.js
- src/*.js
+ - test/testabilityPatch.js
- src/scenario/Runner.js
- src/scenario/*.js
- - test/testabilityPatch.js
- test/angular-mocks.js
- test/scenario/*.js
- test/*.js