diff options
| author | Pushkar Joshi | 2012-02-02 11:28:45 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-02 11:28:45 -0800 |
| commit | acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9 (patch) | |
| tree | 877f8ca734228c11050b037ce82fc0d1e1303193 /js/preloader | |
| parent | 4d4de64472603426a73b26cc98ba8206190949b8 (diff) | |
| parent | 4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff) | |
| download | ninja-acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9.tar.gz | |
Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool
Diffstat (limited to 'js/preloader')
| -rwxr-xr-x | js/preloader/Preloader.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 93d71e8f..3daeb1b4 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -64,7 +64,6 @@ exports.Preloader = Montage.create(Component, { | |||
| 64 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | 64 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, |
| 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, |
| 66 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 66 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
| 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BrickMaterial.js"}, | ||
| 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
| 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, |
| 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, |