diff options
| author | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
| commit | 5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch) | |
| tree | af71b72b828d942ebf11f565b7c9ccff0798343d /js/ninja.reel/ninja.html | |
| parent | 8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff) | |
| parent | 526b9d76686323f488f1b26175440172b715d808 (diff) | |
| download | ninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz | |
Merge branch 'refs/heads/master' into GIO-TextTool
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 | ||