diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/ninja.reel/ninja.html | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -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> |