diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/ninja.reel | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 022b3f0a..1393b4b9 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -363,9 +363,6 @@ | |||
| 363 | <section id="rulerLeft"></section> | 363 | <section id="rulerLeft"></section> |
| 364 | <section id="stageAndScenesContainer"></section> | 364 | <section id="stageAndScenesContainer"></section> |
| 365 | </section> | 365 | </section> |
| 366 | |||
| 367 | <section id="sceneBar" style="display: none;"></section> | ||
| 368 | |||
| 369 | <section id="stateBar"> | 366 | <section id="stateBar"> |
| 370 | <section id="documentBarContainer"> | 367 | <section id="documentBarContainer"> |
| 371 | <div id="documentBar" class="documentBar"><a href="#">HTML</a></div> | 368 | <div id="documentBar" class="documentBar"><a href="#">HTML</a></div> |