diff options
| author | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
| commit | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch) | |
| tree | 6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /imports | |
| parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'imports')
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/imports/codemirror/keymap/vim.js | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | (func | ||