diff options
| author | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-06 17:04:40 -0800 |
| commit | 7a43958033906b2273de88bc2a26cda7a905d202 (patch) | |
| tree | f71817e712c4b07a48257a4f0b206cf9033421df /imports | |
| parent | 264e3d8e6d3624083d2fab9fe2560234553bb2ad (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-7a43958033906b2273de88bc2a26cda7a905d202.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports')
116 files changed, 3186 insertions, 466 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 | |||