aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-08 13:14:47 -0800
committerJose Antonio Marquez2012-02-08 13:14:47 -0800
commit553e06c9e903e845cb9cd73971d59561fca375c7 (patch)
treeb85718d3c307c4693be75774ed68191bce9aebbf /js/preloader
parent4bfac53c9a77a3af35d029757eece53f4b7212ed (diff)
parent10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
downloadninja-553e06c9e903e845cb9cd73971d59561fca375c7.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 63778b82..1fb81e97 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -60,6 +60,7 @@ exports.Preloader = Montage.create(Component, {
60 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"}, 60 {"type":"js", "url":"js/helper-classes/RDGE/src/core/script/util/dbgpanel.js"},
61 /* */ 61 /* */
62 62
63 {"type":"js", "url":"js/helper-classes/3D/ParseUtils.js"},
63 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"}, 64 {"type":"js", "url":"js/helper-classes/RDGE/GLLine.js"},
64 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"}, 65 {"type":"js", "url":"js/helper-classes/RDGE/GLMaterial.js"},
65 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"}, 66 {"type":"js", "url":"js/helper-classes/RDGE/GLLight.js"},