diff options
author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/video-player.reel/video-player.html | |
parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/video-player.reel/video-player.html')
-rwxr-xr-x | node_modules/montage/ui/video-player.reel/video-player.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/node_modules/montage/ui/video-player.reel/video-player.html b/node_modules/montage/ui/video-player.reel/video-player.html index 96e8bf29..f5d2cf2d 100755 --- a/node_modules/montage/ui/video-player.reel/video-player.html +++ b/node_modules/montage/ui/video-player.reel/video-player.html | |||
@@ -48,7 +48,7 @@ | |||
48 | } | 48 | } |
49 | }, | 49 | }, |
50 | "slider1": { | 50 | "slider1": { |
51 | "module": "montage/ui/slider.reel", | 51 | "module": "montage/ui/bluemoon/slider.reel", |
52 | "name": "Slider", | 52 | "name": "Slider", |
53 | "properties": { | 53 | "properties": { |
54 | "element": { | 54 | "element": { |
@@ -78,7 +78,7 @@ | |||
78 | } | 78 | } |
79 | }, | 79 | }, |
80 | "togglebutton1": { | 80 | "togglebutton1": { |
81 | "module": "montage/ui/button.reel", | 81 | "module": "montage/ui/bluemoon/button.reel", |
82 | "name": "ToggleButton", | 82 | "name": "ToggleButton", |
83 | "properties": { | 83 | "properties": { |
84 | "element": { | 84 | "element": { |
@@ -106,7 +106,7 @@ | |||
106 | } | 106 | } |
107 | }, | 107 | }, |
108 | "button1": { | 108 | "button1": { |
109 | "module": "montage/ui/button.reel", | 109 | "module": "montage/ui/bluemoon/button.reel", |
110 | "name": "Button", | 110 | "name": "Button", |
111 | "properties": { | 111 | "properties": { |
112 | "element": { | 112 | "element": { |
@@ -134,7 +134,7 @@ | |||
134 | } | 134 | } |
135 | }, | 135 | }, |
136 | "button2": { | 136 | "button2": { |
137 | "module": "montage/ui/button.reel", | 137 | "module": "montage/ui/bluemoon/button.reel", |
138 | "name": "Button", | 138 | "name": "Button", |
139 | "properties": { | 139 | "properties": { |
140 | "element": { | 140 | "element": { |
@@ -162,7 +162,7 @@ | |||
162 | } | 162 | } |
163 | }, | 163 | }, |
164 | "button3": { | 164 | "button3": { |
165 | "module": "montage/ui/button.reel", | 165 | "module": "montage/ui/bluemoon/button.reel", |
166 | "name": "Button", | 166 | "name": "Button", |
167 | "properties": { | 167 | "properties": { |
168 | "element": { | 168 | "element": { |
@@ -190,7 +190,7 @@ | |||
190 | } | 190 | } |
191 | }, | 191 | }, |
192 | "button4": { | 192 | "button4": { |
193 | "module": "montage/ui/button.reel", | 193 | "module": "montage/ui/bluemoon/button.reel", |
194 | "name": "Button", | 194 | "name": "Button", |
195 | "properties": { | 195 | "properties": { |
196 | "element": { | 196 | "element": { |
@@ -218,7 +218,7 @@ | |||
218 | } | 218 | } |
219 | }, | 219 | }, |
220 | "button5": { | 220 | "button5": { |
221 | "module": "montage/ui/button.reel", | 221 | "module": "montage/ui/bluemoon/button.reel", |
222 | "name": "Button", | 222 | "name": "Button", |
223 | "properties": { | 223 | "properties": { |
224 | "element": { | 224 | "element": { |
@@ -246,7 +246,7 @@ | |||
246 | } | 246 | } |
247 | }, | 247 | }, |
248 | "button6": { | 248 | "button6": { |
249 | "module": "montage/ui/button.reel", | 249 | "module": "montage/ui/bluemoon/button.reel", |
250 | "name": "Button", | 250 | "name": "Button", |
251 | "properties": { | 251 | "properties": { |
252 | "element": { | 252 | "element": { |
@@ -274,7 +274,7 @@ | |||
274 | } | 274 | } |
275 | }, | 275 | }, |
276 | "button7": { | 276 | "button7": { |
277 | "module": "montage/ui/button.reel", | 277 | "module": "montage/ui/bluemoon/button.reel", |
278 | "name": "Button", | 278 | "name": "Button", |
279 | "properties": { | 279 | "properties": { |
280 | "element": { | 280 | "element": { |