diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
| commit | a9b1a1f2642841c4165ede69d131b1deb6238622 (patch) | |
| tree | 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js/preloader/Preloader.js | |
| parent | 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff) | |
| parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
| download | ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/preloader/Preloader.js')
| -rwxr-xr-x | js/preloader/Preloader.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/preloader/Preloader.js b/js/preloader/Preloader.js index 42460093..d735af0b 100755 --- a/js/preloader/Preloader.js +++ b/js/preloader/Preloader.js | |||
| @@ -65,7 +65,6 @@ 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 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, | 67 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/FlatMaterial.js"}, |
| 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/BrickMaterial.js"}, | ||
| 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, | 68 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/UberMaterial.js"}, |
| 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, | 69 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/PlasmaMaterial.js"}, |
| 71 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, | 70 | {"type":"js", "url":"js/helper-classes/RDGE/Materials/RadialGradientMaterial.js"}, |