diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/bluemoon/slider.reel/slider.html | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon/slider.reel/slider.html')
| -rw-r--r-- | node_modules/montage/ui/bluemoon/slider.reel/slider.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/bluemoon/slider.reel/slider.html b/node_modules/montage/ui/bluemoon/slider.reel/slider.html index de422a4a..e80a520e 100644 --- a/node_modules/montage/ui/bluemoon/slider.reel/slider.html +++ b/node_modules/montage/ui/bluemoon/slider.reel/slider.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| 14 | "prototype": "montage/ui/bluemoon/slider.reel", | 14 | "prototype": "ui/bluemoon/slider.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": { | 16 | "element": { |
| 17 | "#": "slider" | 17 | "#": "slider" |