aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/property-control.reel
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/ui/property-control.reel
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/ui/property-control.reel')
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index d85cb0e3..0535ea5f 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.html
@@ -28,10 +28,10 @@
28 </script> 28 </script>
29</head> 29</head>
30<body> 30<body>
31 <div id="propControl" class="propControl"> 31 <div data-montage-id="propControl" class="propControl">
32 <div id="propLabel" class="prop-label"></div> 32 <div data-montage-id="propLabel" class="prop-label"></div>
33 <div id="propController" class="prop-controller"> 33 <div data-montage-id="propController" class="prop-controller">
34 <div id="subDummy"></div> 34 <div data-montage-id="subDummy"></div>
35 </div> 35 </div>
36 </div> 36 </div>
37</body> 37</body>