aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/line-properties.reel
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/components/tools-properties/line-properties.reel
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/components/tools-properties/line-properties.reel')
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html
index 1ec14cca..0033b8a7 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.html
+++ b/js/components/tools-properties/line-properties.reel/line-properties.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/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/components/tools-properties/line-properties.reel", 15 "prototype": "js/components/tools-properties/line-properties.reel",
16 "name": "LineProperties",
17 "properties": { 16 "properties": {
18 "element": {"#": "lineProperties"} 17 "element": {"#": "lineProperties"}
19 } 18 }
@@ -24,7 +23,7 @@
24 </head> 23 </head>
25 24
26 <body> 25 <body>
27 <div id="lineProperties"></div> 26 <div data-montage-id="lineProperties"></div>
28 </body> 27 </body>
29 28
30</html> \ No newline at end of file 29</html> \ No newline at end of file