diff options
| author | Donghwa Lee <dh09.lee@samsung.com> | 2013-05-02 10:20:59 +0900 |
|---|---|---|
| committer | Donghwa Lee <dh09.lee@samsung.com> | 2013-05-02 10:20:59 +0900 |
| commit | 5eb01863228fbb74f879f69e0a3a64563ded088a (patch) | |
| tree | 37643e7b2110d4a4b469a3c5f2e444ae83065dde /LICENSE.Flora | |
| parent | 4f2091a2332d8e3bc8b350e90a32ba4842705ac4 (diff) | |
| download | mfc-firmware-5eb01863228fbb74f879f69e0a3a64563ded088a.tar.gz mfc-firmware-5eb01863228fbb74f879f69e0a3a64563ded088a.tar.bz2 mfc-firmware-5eb01863228fbb74f879f69e0a3a64563ded088a.zip | |
update Flora license to version 1.1
Change-Id: Ie326817f7ce008b1feea084f6adfe1aaafaea6be
Signed-off-by: Donghwa Lee <dh09.lee@samsung.com>
Diffstat (limited to 'LICENSE.Flora')
| -rw-r--r-- | LICENSE.Flora | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at |