diff options
author | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-20 16:48:34 -0700 |
commit | 4eff115126ab946c5852d787fd596e07b156c9a5 (patch) | |
tree | f7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /js/code-editor/ui | |
parent | 7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff) | |
parent | 392a559e90357d48c910a07617261483b2b45476 (diff) | |
download | ninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/code-editor/ui')
-rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 2c91ca13..4448e1f1 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "codeCompleteCheck":{ | 13 | "codeCompleteCheck":{ |
14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/input-checkbox.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
17 | }, | 17 | }, |