diff options
author | Nivesh Rajbhandari | 2012-02-22 16:45:08 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-22 16:45:08 -0800 |
commit | 1ed02c161f0fc063299a606e61ccece878a307a3 (patch) | |
tree | d28b88a62125446644a220ef706cabcb46dc15e7 /js/ninja.reel | |
parent | 5272d5585b0fbae233d829ac9a9b5207838ec74c (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-1ed02c161f0fc063299a606e61ccece878a307a3.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
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> |