aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/LICENSE
diff options
context:
space:
mode:
authorAnanya Sen2012-07-17 14:25:53 -0700
committerAnanya Sen2012-07-17 14:25:53 -0700
commit09457e39532e9b35afb9c635266755bfcb9b488a (patch)
tree665dcbd41377b98dcab15ff995e9434d9db1a462 /imports/codemirror/LICENSE
parentf2dbca782bbaca3bed96dff808693693ba083ea9 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
Diffstat (limited to 'imports/codemirror/LICENSE')
-rw-r--r--imports/codemirror/LICENSE2
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 @@
1Copyright (C) 2011 by Marijn Haverbeke <marijnh@gmail.com> 1Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com>
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy 3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to deal 4of this software and associated documentation files (the "Software"), to deal