aboutsummaryrefslogtreecommitdiff
path: root/js/components/combobox.reel
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/components/combobox.reel
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/combobox.reel')
-rwxr-xr-xjs/components/combobox.reel/combobox.html3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html
index d78cc9c1..a68dd37f 100755
--- a/js/components/combobox.reel/combobox.html
+++ b/js/components/combobox.reel/combobox.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/components/combobox.reel", 12 "prototype": "js/components/combobox.reel",
13 "name": "Combobox",
14 "properties": { 13 "properties": {
15 "element": {"#": "cb_comp"} 14 "element": {"#": "cb_comp"}
16 } 15 }