aboutsummaryrefslogtreecommitdiff
path: root/js/preloader
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 13:12:43 -0700
committerEric Guzman2012-03-13 13:12:43 -0700
commit61fd46cad105f0a52afa028e5301b96120f00ab4 (patch)
treed8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/preloader
parent7e3161153b87b891875ac65368a19aed12909fa3 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/preloader')
-rwxr-xr-xjs/preloader/Preloader.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js
index b584cb76..feda2569 100755
--- a/js/preloader/Preloader.js
+++ b/js/preloader/Preloader.js
@@ -64,6 +64,8 @@ exports.Preloader = Montage.create(Component, {
64 */ 64 */
65 65
66 66
67 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeGeomObj.js"},
68 {"type":"js", "url":"js/helper-classes/RDGE/runtime/RuntimeMaterial.js"},
67 69
68 70
69 71