diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/codemirror/notice.txt | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/codemirror/notice.txt')
| -rw-r--r-- | js/codemirror/notice.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/js/codemirror/notice.txt b/js/codemirror/notice.txt deleted file mode 100644 index ff52173b..00000000 --- a/js/codemirror/notice.txt +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | /* <notice> | ||
| 2 | Code from http://http://codemirror.net/ and https://github.com/marijnh/CodeMirror<br/> | ||
| 3 | License https://github.com/marijnh/CodeMirror/blob/master/LICENSE<br/> | ||
| 4 | </notice> */ \ No newline at end of file | ||