aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-10 15:33:20 -0800
committerJose Antonio Marquez2012-02-10 15:33:20 -0800
commitf7f445e8ced728d04de4bf1c5711f6756488a71e (patch)
treeb09f00c28ff7123354af40509283ddec846f438d /js/ninja.reel/ninja.html
parent632a5daca17acb774b9344ccc0e9107f1643924c (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html12
1 files changed, 5 insertions, 7 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c170b16f..a17f6583 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -293,7 +293,8 @@
293 "newFileController": {"@": "newFileController"}, 293 "newFileController": {"@": "newFileController"},
294 "coreIoApi": {"@": "coreIoApi1"}, 294 "coreIoApi": {"@": "coreIoApi1"},
295 "documentBar": {"@": "documentBar"}, 295 "documentBar": {"@": "documentBar"},
296 "ioMediator": {"@": "ioMediator"} 296 "ioMediator": {"@": "ioMediator"},
297 "timeline": {"@": "timeline"}
297 } 298 }
298 } 299 }
299 300
@@ -358,13 +359,10 @@
358 </section> 359 </section>
359 360
360 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 361 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
361 362 <section id="breadCrumbTrail">
363 <div id="breadCrumbComponent"></div>
364 </section>
362 <section id="bottomPanelContainer" class="panelContainer"> 365 <section id="bottomPanelContainer" class="panelContainer">
363
364 <section id="breadCrumbTrail">
365 <div id="breadCrumbComponent"></div>
366 </section>
367
368 <section id="timelinePanel" class="panel"> 366 <section id="timelinePanel" class="panel">
369 <div id="timelinePanelComponent"></div> 367 <div id="timelinePanelComponent"></div>
370 </section> 368 </section>