aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-09 12:09:09 -0800
committerJose Antonio Marquez2012-02-09 12:09:09 -0800
commit44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch)
tree0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/preloader
parentd7e198f5a95011679fa2c536780edbdc533a4893 (diff)
parentce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff)
downloadninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 1fb81e97..b3bd1b23 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"},