diff options
| author | Jonathan Duran | 2012-06-27 12:10:00 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-27 12:10:00 -0700 |
| commit | ae2067a09cd9cd0ee60eac7bd35395bf81045626 (patch) | |
| tree | f233ad47ef7ff229c8595d0b2ce36c3be7e7aec7 /js/ninja.reel/ninja.js | |
| parent | 0b0ad28a216d839aab37b2563912bb82f79768d1 (diff) | |
| parent | 8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff) | |
| download | ninja-ae2067a09cd9cd0ee60eac7bd35395bf81045626.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | }, |