aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-10 16:04:19 -0800
committerJohn Mayhew2012-02-10 16:04:19 -0800
commit730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch)
treec86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/ninja.reel/ninja.html
parentcde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/ninja.reel/ninja.html
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rw-r--r--js/ninja.reel/ninja.html8
1 files changed, 3 insertions, 5 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1ce94722..c8625159 100644
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -285,8 +285,9 @@
285 "filePickerController": {"@": "filePickerController"}, 285 "filePickerController": {"@": "filePickerController"},
286 "newFileController": {"@": "newFileController"}, 286 "newFileController": {"@": "newFileController"},
287 "documentBar": {"@": "documentBar"}, 287 "documentBar": {"@": "documentBar"},
288 "timeline": {"@": "timeline"},
288 "mainMenuController": {"@": "mainMenuController"} 289 "mainMenuController": {"@": "mainMenuController"}
289 } 290 }
290 } 291 }
291 } 292 }
292 </script> 293 </script>
@@ -349,13 +350,10 @@
349 </section> 350 </section>
350 351
351 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 352 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
352
353 <section id="bottomPanelContainer" class="panelContainer">
354
355 <section id="breadCrumbTrail"> 353 <section id="breadCrumbTrail">
356 <div id="breadCrumbComponent"></div> 354 <div id="breadCrumbComponent"></div>
357 </section> 355 </section>
358 356 <section id="bottomPanelContainer" class="panelContainer">
359 <section id="timelinePanel" class="panel"> 357 <section id="timelinePanel" class="panel">
360 <div id="timelinePanelComponent"></div> 358 <div id="timelinePanelComponent"></div>
361 </section> 359 </section>