aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/menu/menu.reel
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/menu/menu.reel')
-rwxr-xr-xjs/components/menu/menu.reel/menu.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index adaf68ea..49956f8a 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -73,9 +73,9 @@
73</head> 73</head>
74<body> 74<body>
75 75
76 <nav id="mainMenuBar" class="mainMenuBar unselectable"> 76 <nav data-montage-id="mainMenuBar" class="mainMenuBar unselectable">
77 <ul id="topMenu" class="horizontal-menu"> 77 <ul data-montage-id="topMenu" class="horizontal-menu">
78 <li id="menuItem"></li> 78 <li data-montage-id="menuItem"></li>
79 </ul> 79 </ul>
80 </nav> 80 </nav>
81 81