aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/property-control.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /js/components/ui/property-control.reel
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
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>