# HG changeset patch
# User Bradley M. Kuhn <bkuhn@sfconservancy.org>
# Date 2014-05-16 22:06:47
# Node ID 8c543e371e395a75dd41239513913a3315288d5b
# Parent  bb9ef063806909de239d284d22a73841d6709a42

Update LICENSE.md to include license information about Codemirror 3.15

Add information to the LICENSE.md file to include the information provided in
the codemirror-3.15/LICENSE file.

Also, note that other license and copyright information also appears in
.../public/js/mode/ sub-directories.

diff --git a/LICENSE.md b/LICENSE.md
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -22,4 +22,23 @@ entirety in the file Apache-License-2.0.
 
 
 
+Codemirror
+----------
+
+Kallithea incorporates parts of the Javascript system called
+[Codemirror](http://codemirror.net/), which is primarily:
+
+Copyright &copy; 2013 by Marijn Haverbeke <marijnh@gmail.com>
+
+and licensed under the MIT-permissive license, which is
+[included in this distribution](MIT-Permissive-License.txt).
+
+Additional files from upstream Codemirror are copyrighted by various authors
+and licensed under other permissive licenses.  The sub-directories under
+[.../public/js/mode/](rhodecode/public/js/mode) include the copyright and
+license notice and information as they appeared in Codemirror's upstream
+release.
+
+
+
 EOF