diff options
author | Jon Reid | 2012-03-06 18:08:37 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 18:08:37 -0800 |
commit | 6056fdb63b5f4690115e63ee50e8d7dac309ba64 (patch) | |
tree | 5fbe386e4c7732fb84b98c9539b186898f076c7b /imports/codemirror/LICENSE | |
parent | bcfb704b04587f95a13c474cf0598ba90ec3b371 (diff) | |
parent | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (diff) | |
download | ninja-6056fdb63b5f4690115e63ee50e8d7dac309ba64.tar.gz |
Merge branch 'Timeline-uber' into timeline-serialized
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. | ||