diff options
| author | Eric Guzman | 2012-02-08 15:33:30 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-08 15:33:30 -0800 |
| commit | 4ab650bccc776b031191dc410a93309a9d342bab (patch) | |
| tree | 55a2c7cdda8cce2ede9a8efcb3e77bfa96abc821 /js/preloader/Preloader.js | |
| parent | 7fc8ce44579b0464710d0696782daf7df776b1a0 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-4ab650bccc776b031191dc410a93309a9d342bab.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/preloader/Preloader.js')
| -rwxr-xr-x | js/preloader/Preloader.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 93d71e8f..42460093 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"}, |