diff options
| author | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
| commit | 9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch) | |
| tree | dad948f012cbc7d65e0dccde273667a389ff1c6d /imports/codemirror | |
| parent | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff) | |
| parent | b4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff) | |
| download | ninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'imports/codemirror')
116 files changed, 3186 insertions, 466 deletions
diff --git a/imports/codemirror/LICENSE b/imports/codemirror/LICENSE index 3f7c0bb1..f62410e6 100755..100644 --- a/imports/codemirror/LICENSE +++ b/imports/codemirror/LICENSE | |||
| @@ -17,3 +17,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||
| 17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 19 | THE SOFTWARE. | 19 | THE SOFTWARE. |
| 20 | |||
| 21 | Please note that some subdirectories of the CodeMirror distribution | ||
| 22 | include their own LICENSE files, and are released under different | ||
| 23 | licences. | ||
diff --git a/imports/codemirror/keymap/emacs.js b/imports/codemirror/keymap/emacs.js index 8fd3564e..8fd3564e 100755..100644 --- a/imports/codemirror/keymap/emacs.js +++ b/imports/codemirror/keymap/emacs.js | |||
diff --git a/imports/codemirror/keymap/vim.js b/imports/codemirror/keymap/vim.js index e03e0128..f8fa5e07 100755..100644 --- a/imports/codemirror/keymap/vim.js +++ b/ | |||