aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/Panel.reel/Panel.html
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Panel.reel/Panel.html')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index f0fb1044..5937b58f 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -75,7 +75,6 @@
75 "prototype": "montage/ui/button.reel", 75 "prototype": "montage/ui/button.reel",
76 "properties": { 76 "properties": {
77 "element": {"#": "btnClose"}, 77 "element": {"#": "btnClose"},
78 "pressedClass": "hide",
79 "identifier": "btnClose" 78 "identifier": "btnClose"
80 }, 79 },
81 "listeners": [ 80 "listeners": [