diff options
| author | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-09 13:41:45 -0800 |
| commit | f5193cd04a2597051d88fced878efbc4802ea64c (patch) | |
| tree | dc343dc98fa9f99133d9882bd9b92cfe81296d1a /js/preloader | |
| parent | e2539230b8a297fa972af6d53fe9de3ef2ad43fa (diff) | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| download | ninja-f5193cd04a2597051d88fced878efbc4802ea64c.tar.gz | |
Merge branch 'refs/heads/master' into components
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 42460093..d735af0b 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -65,7 +65,6 @@ exports.Preloader = Montage.create(Component, { | |||
| 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, | 65 | {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, |
| 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, | 66 | {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, |
| 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
| 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BrickMaterial.js"}, | ||
| 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
| 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, |
| 71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, |