aboutsummaryrefslogtreecommitdiff
path: root/js/preloader/Preloader.js
diff options
context:
space:
mode:
authorJon Reid2012-02-27 12:08:17 -0800
committerJon Reid2012-02-27 12:08:17 -0800
commitd55224f36da55e26c266a02efa6e58d4ecf1253e (patch)
tree36faa8ff93c0f7b925f5c0a7fb85b5d209da1f8e /js/preloader/Preloader.js
parentec5f81c6c0ccf865505ab82ebf9240c667f05c91 (diff)
parentcf9e9b711ba3d77a2a0888f8ab763383f53a1619 (diff)
downloadninja-d55224f36da55e26c266a02efa6e58d4ecf1253e.tar.gz
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local
Diffstat (limited to 'js/preloader/Preloader.js')
-rwxr-xr-xjs/preloader/Preloader.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index 21d7fcee..5b806909 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -65,6 +65,9 @@ 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 67
68 {"type":"js", "url":"js/helper-classes/RDGE/runtime/CanvasDataManager.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/runtime/GLRuntime.js"},
70
68 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, 71 {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"},
69 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"}, 72 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TaperMaterial.js"},
70 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"}, 73 {"type":"js", "url":"js/helper-classes/RDGE/Materials/TwistVertMaterial.js"},