aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TrackSpacer.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Timeline/TrackSpacer.reel
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel')
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index 47778b5d..54944e5d 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
@@ -22,8 +22,8 @@
22 </head> 22 </head>
23 <body> 23 <body>
24 24
25 <div id="trackspace"> 25 <div data-montage-id="trackspace">
26 <div id="track_spacer" class="trackspacer"></div> 26 <div data-montage-id="track_spacer" class="trackspacer"></div>
27 </div> 27 </div>
28 28
29 </body> 29 </body>