aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorhwc4872012-02-07 14:42:51 -0800
committerhwc4872012-02-07 14:42:51 -0800
commit6173fe8440152b1e4c63834a6b4dc7573d532339 (patch)
treed23449204ae7f23cb9bab09836d126e90c30484b /js/preloader
parent2d4da18a778471b02e188ad668752e331ee76127 (diff)
parentaec849d91e4b697d496b9ede28b5d89cf2283781 (diff)
downloadninja-6173fe8440152b1e4c63834a6b4dc7573d532339.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
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 12028e32..f8a87c19 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"},