diff options
| author | Jonathan Duran | 2012-07-17 11:42:09 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-17 11:42:09 -0700 |
| commit | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch) | |
| tree | 2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/LICENSE | |
| parent | 4a87ff575693509ac578d46af26fa137c0dc3f58 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/LICENSE')
| -rw-r--r-- | imports/codemirror/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/LICENSE b/imports/codemirror/LICENSE index f62410e6..3916e96b 100644 --- a/imports/codemirror/LICENSE +++ b/imports/codemirror/LICENSE | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2011 by Marijn Haverbeke <marijnh@gmail.com> | 1 | Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com> |
| 2 | 2 | ||
| 3 | Permission is hereby granted, free of charge, to any person obtaining a copy | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| 4 | of this software and associated documentation files (the "Software"), to deal | 4 | of this software and associated documentation files (the "Software"), to deal |