Chromium Code Reviews| Index: base/third_party/xdg_mime/LICENSE |
| diff --git a/base/third_party/xdg_mime/LICENSE b/base/third_party/xdg_mime/LICENSE |
| index 876ec23c3c30c2faf7d00fde761a5209f4ac16f4..24cc8de984d0ba14b689b352bc401f540d85c5db 100644 |
| --- a/base/third_party/xdg_mime/LICENSE |
| +++ b/base/third_party/xdg_mime/LICENSE |
| @@ -1,17 +1,17 @@ |
| -# Permission is hereby granted, free of charge, to any person obtaining a |
| -# copy of this software and associated documentation files (the "Software"), |
| -# to deal in the Software without restriction, including without limitation |
| -# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| -# and/or sell copies of the Software, and to permit persons to whom the |
| -# Software is furnished to do so, subject to the following conditions: |
| -# |
| -# The above copyright notice and this permission notice shall be included |
| -# in all copies or substantial portions of the Software. |
| -# |
| -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
| -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR |
| -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
| -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
| -# OTHER DEALINGS IN THE SOFTWARE. |
| +Licensed under the Academic Free License version 2.0 |
|
Mark Mentovai
2012/08/01 18:16:13
Where did you get this? It looks like stuff you pu
Steve Block
2012/08/01 19:12:38
Yes, I took it from the header used in the source
|
| +Or under the following terms: |
| + |
| +This library is free software; you can redistribute it and/or |
| +modify it under the terms of the GNU Lesser General Public |
| +License as published by the Free Software Foundation; either |
| +version 2 of the License, or (at your option) any later version. |
| + |
| +This library is distributed in the hope that it will be useful, |
| +but WITHOUT ANY WARRANTY; without even the implied warranty of |
| +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| +Lesser General Public License for more details. |
| + |
| +You should have received a copy of the GNU Lesser General Public |
| +License along with this library; if not, write to the |
| +Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| +Boston, MA 02111-1307, USA. |