diff options
| author | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-27 15:32:38 -0700 |
| commit | 60554730ac89bb874f811ba312c491d5caacf8ce (patch) | |
| tree | 3b78bab74798812a38c05bfba0f88c407f98031f /js/ninja.reel/ninja.js | |
| parent | f704705fd85c1af44ad86f8c29e8e93d330796e5 (diff) | |
| parent | 07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff) | |
| download | ninja-60554730ac89bb874f811ba312c491d5caacf8ce.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.js')
| -rwxr-xr-x | js/ninja.reel/ninja.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index f1825b9a..859268a0 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -137,7 +137,7 @@ exports.Ninja = Montage.create(Component, { | |||
| 137 | serializable: true | 137 | serializable: true |
| 138 | }, | 138 | }, |
| 139 | 139 | ||
| 140 | codeEditorController: { | 140 | codeEditorWrapper: { |
| 141 | value: null, | 141 | value: null, |
| 142 | serializable: true | 142 | serializable: true |
| 143 | }, | 143 | }, |