aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel/tool-button.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-27 15:05:38 -0700
committerPushkar Joshi2012-04-27 15:05:38 -0700
commitc8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch)
tree74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/layout/tool-button.reel/tool-button.html
parent28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.html')
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html5
1 files changed, 2 insertions, 3 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 476b66f3..3980b92c 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.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 <script type="text/montage-serialization"> 13 <script type="text/montage-serialization">
14 { 14 {
15 "owner": { 15 "owner": {
16 "module": "js/components/layout/tool-button.reel", 16 "prototype": "js/components/layout/tool-button.reel",
17 "name": "ToolButton",
18 "properties": { 17 "properties": {
19 "element": {"#": "toolBarButton"} 18 "element": {"#": "toolBarButton"}
20 } 19 }