diff options
| author | Pushkar Joshi | 2012-03-06 17:05:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-06 17:05:05 -0800 |
| commit | 794abd077a0cd4c797d3f566281deca77b184bfe (patch) | |
| tree | 3bf4a83ca714def2671fe8cef93db859b0d5553f /imports/codemirror/LICENSE | |
| parent | c155cd238b6f9e0b8191e0fc533f7bc974b762c2 (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-794abd077a0cd4c797d3f566281deca77b184bfe.tar.gz | |
Merge branch 'master' into pentool
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. | ||