diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/preloader/Preloader.js | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/preloader/Preloader.js')
-rwxr-xr-x | js/preloader/Preloader.js | 2 |
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 | ||