diff options
author | Jose Antonio Marquez | 2012-07-17 14:01:12 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-07-17 14:01:12 -0700 |
commit | f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd (patch) | |
tree | cb1ff6a31b144fe4f584f778d5691f06362b227e /imports/codemirror/LICENSE | |
parent | 17d464e5bd224cdd8940855409359b411325f1df (diff) | |
parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
download | ninja-f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd.tar.gz |
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'imports/codemirror/LICENSE')
-rw-r--r-- | imports/codemirror/LICENSE | 2 |
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 @@ | |||
1 | Copyright (C) 2011 by Marijn Haverbeke <marijnh@gmail.com> | 1 | Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com> |
2 | 2 | ||
3 | Permission is hereby granted, free of charge, to any person obtaining a copy | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy |
4 | of this software and associated documentation files (the "Software"), to deal | 4 | of this software and associated documentation files (the "Software"), to deal |