diff options
author | Nivesh Rajbhandari | 2012-02-28 15:04:33 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-28 15:04:33 -0800 |
commit | eb27ed35bf282262843de13b00af89a2bceac53f (patch) | |
tree | 6d78d3223062a2693d5b61499dc97fd8cb7161cd /js/preloader | |
parent | ea5962641519b9d32499c4440112e7fa821e3a79 (diff) | |
parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
download | ninja-eb27ed35bf282262843de13b00af89a2bceac53f.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/preloader')
-rwxr-xr-x | js/preloader/Preloader.js | 3 |
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"}, |