diff options
| author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
| commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
| tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/preloader | |
| parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
| parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
| download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/preloader')
| -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"}, |