From ad7bb953fa31ea5b3db592bb8d4d3cc3da408743 Mon Sep 17 00:00:00 2001 From: Rob Frawley 2nd Date: Tue, 6 Sep 2016 17:52:15 -0400 Subject: [PATCH] Add new LICENSE.md with updated copyright. Remote old Resources/meta/LICENSE. Detailed changes: - Created a simple, markdown-styled version of the MIT license. - Added Liip website to license (ttps://www.liip.ch/) - Added GitHub Contributors to license copyright - Contributors link: https://github.com/liip/LiipImagineBundle/graphs/contributors Previous, squashed commits include: 1. Add new root-level LICENSE.md to project 2. Remove Resources/meta/LICESNE (old location of license) added avalance original copyright notice --- LICENSE.md | 22 ++++++++++++++++++++++ Resources/meta/LICENSE | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 LICENSE.md delete mode 100644 Resources/meta/LICENSE diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..f214eb401 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,22 @@ + +# The MIT License (MIT) + +- **Copyright © 2010-2016 Liip & Contributors <[liip/LiipImagineBundle](https://github.com/liip/LiipImagineBundle/graphs/contributors)>** +- **Copyright © 2004-2011 Bulat Shakirzyanov <[avalanche123/AvalancheImagineBundle](https://github.com/avalanche123/AvalancheImagineBundle)>** + +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. diff --git a/Resources/meta/LICENSE b/Resources/meta/LICENSE deleted file mode 100644 index a051eb0e2..000000000 --- a/Resources/meta/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2010-2011 Liip - -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.