diff options
author | Jon Reid | 2012-03-06 18:08:11 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 18:08:11 -0800 |
commit | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (patch) | |
tree | f52c7dcc837dd98d28f505696b67b94db15e4c63 /imports/codemirror/LICENSE | |
parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
parent | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (diff) | |
download | ninja-a12603cfcfe9d82def3b972dcbcc80f1e790ad85.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'imports/codemirror/LICENSE')
-rw-r--r--[-rwxr-xr-x] | imports/codemirror/LICENSE | 4 |
1 files changed, 4 insertions, 0 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. | ||