aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html')
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html9
1 files changed, 4 insertions, 5 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index 94f5c278..54944e5d 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/TrackSpacer.reel", 14 "prototype": "js/panels/Timeline/TrackSpacer.reel",
15 "name": "TrackSpacer",
16 "properties": { 15 "properties": {
17 "element": {"#": "trackspace"} 16 "element": {"#": "trackspace"}
18 } 17 }
@@ -23,8 +22,8 @@
23 </head> 22 </head>
24 <body> 23 <body>
25 24
26 <div id="trackspace"> 25 <div data-montage-id="trackspace">
27 <div id="track_spacer" class="trackspacer"></div> 26 <div data-montage-id="track_spacer" class="trackspacer"></div>
28 </div> 27 </div>
29 28
30 </body> 29 </body>