aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pencil-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/pencil-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/pencil-properties.reel')
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
index 964cdd0e..cbe626b2 100755
--- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
+++ b/js/components/tools-properties/pencil-properties.reel/pencil-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/>
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "owner": { 15 "owner": {
16 "module": "js/components/tools-properties/pencil-properties.reel", 16 "prototype": "js/components/tools-properties/pencil-properties.reel",
17 "name": "PencilProperties",
18 "properties": { 17 "properties": {
19 "element": {"#": "pencilProperties"} 18 "element": {"#": "pencilProperties"}
20 } 19 }
@@ -25,7 +24,7 @@
25 </head> 24 </head>
26 25
27 <body> 26 <body>
28 <div id="pencilProperties" class="subToolHolderPanel"> 27 <div data-montage-id="pencilProperties" class="subToolHolderPanel">
29 </div> 28 </div>
30 </body> 29 </body>
31 30