diff options
| author | hwc487 | 2012-06-29 09:32:42 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-29 09:32:42 -0700 |
| commit | 1c01f1012576dace5f886456f2207e19be366431 (patch) | |
| tree | ecc03194eea98f0544e80d3051a6e6545d0a97b9 /js/ninja.reel/ninja.html | |
| parent | 6cbeb36736e5a012fa1688db78d5981c2e61d95b (diff) | |
| parent | ecd9e3b3b09695e3e7115c04e75add5a20c5c6fe (diff) | |
| download | ninja-1c01f1012576dace5f886456f2207e19be366431.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Diffstat (limited to 'js/ninja.reel/ninja.html')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 5429e7d0..1ebf8413 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -163,7 +163,7 @@ | |||
| 163 | "element": {"#": "stageMode"} | 163 | "element": {"#": "stageMode"} |
| 164 | }, | 164 | }, |
| 165 | "bindings" : { | 165 | "bindings" : { |
| 166 | "livePreview": {"<->": "@appModel.livePreview"} | 166 | "chromePreview": {"<->": "@appModel.chromePreview"} |
| 167 | } | 167 | } |
| 168 | }, | 168 | }, |
| 169 | 169 | ||