diff options
| author | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
|---|---|---|
| committer | Andres Ornelas | 2010-08-04 11:45:42 -0700 |
| commit | ec12285c9d213a50b86b2ff8d968686acd6d1693 (patch) | |
| tree | 94c0792946bfa461c4fab525b3758b06c6da9f9f /jsTestDriver.conf | |
| parent | ef88eb9a71ee7666029c4fb5eb731ce2e986cecc (diff) | |
| parent | 89245f3a527415a80d46b37054b558454c314532 (diff) | |
| download | angular.js-ec12285c9d213a50b86b2ff8d968686acd6d1693.tar.bz2 | |
Merge branch 'master' of github.com:angular/angular.js into future
Diffstat (limited to 'jsTestDriver.conf')
| -rw-r--r-- | jsTestDriver.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jsTestDriver.conf b/jsTestDriver.conf index 16bcf1db..bcd01694 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -6,6 +6,7 @@ load: - lib/jquery/jquery-1.4.2.js - test/jquery_remove.js - src/Angular.js + - src/JSON.js - src/*.js - src/scenario/Runner.js - src/scenario/*.js |