diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/bluemoon/button-group.reel/button-group.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon/button-group.reel/button-group.html')
| -rw-r--r-- | node_modules/montage/ui/bluemoon/button-group.reel/button-group.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html b/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html index 4bda1401..8b192be4 100644 --- a/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html +++ b/node_modules/montage/ui/bluemoon/button-group.reel/button-group.html | |||
| @@ -11,8 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "module": "montage/ui/bluemoon/button-group.reel", | 14 | "prototype": "montage/ui/bluemoon/button-group.reel", |
| 15 | "name": "ButtonGroup", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | 16 | ||
| 18 | } | 17 | } |