| OLD | NEW | 
|---|
| 1 Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com> | 1 The MIT License | 
| 2 | 2 | 
|  | 3 Copyright (c) 2010 Timothy Farrell | 
|  | 4 | 
| 3 Permission is hereby granted, free of charge, to any person obtaining a copy | 5 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 | 6 of this software and associated documentation files (the "Software"), to deal | 
| 5 in the Software without restriction, including without limitation the rights | 7 in the Software without restriction, including without limitation the rights | 
| 6 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | 
| 7 copies of the Software, and to permit persons to whom the Software is | 9 copies of the Software, and to permit persons to whom the Software is | 
| 8 furnished to do so, subject to the following conditions: | 10 furnished to do so, subject to the following conditions: | 
| 9 | 11 | 
| 10 The above copyright notice and this permission notice shall be included in | 12 The above copyright notice and this permission notice shall be included in | 
| 11 all copies or substantial portions of the Software. | 13 all copies or substantial portions of the Software. | 
| 12 | 14 | 
| 13 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 
| 14 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 
| 15 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 
| 16 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 18 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, | 19 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 | 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 
| 19 THE SOFTWARE. | 21 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. |  | 
| OLD | NEW | 
|---|