diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/ui/bluemoon/button.reel/button.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon/button.reel/button.html')
| -rw-r--r-- | node_modules/montage/ui/bluemoon/button.reel/button.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/node_modules/montage/ui/bluemoon/button.reel/button.html b/node_modules/montage/ui/bluemoon/button.reel/button.html index a872b6d0..b46b3161 100644 --- a/node_modules/montage/ui/bluemoon/button.reel/button.html +++ b/node_modules/montage/ui/bluemoon/button.reel/button.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.reel", | 14 | "prototype": "montage/ui/bluemoon/button.reel", |
| 15 | "name": "Button", | ||
| 16 | "properties": { | 15 | "properties": { |
| 17 | 16 | ||
| 18 | } | 17 | } |