diff options
| author | Jaekyun Lee <jkyun.lee@samsung.com> | 2013-05-02 11:48:35 +0900 |
|---|---|---|
| committer | Jaekyun Lee <jkyun.lee@samsung.com> | 2013-05-02 11:48:35 +0900 |
| commit | 4dd4c8c90dcdf7cd521ab56618ebd4ca9152581b (patch) | |
| tree | 0fe80726410609dfb77a366847330cf408c9602b /LICENSE.Flora | |
| parent | 85657077113207b043416babb76315963d8f579f (diff) | |
| download | ug-nfc-efl-4dd4c8c90dcdf7cd521ab56618ebd4ca9152581b.tar.gz ug-nfc-efl-4dd4c8c90dcdf7cd521ab56618ebd4ca9152581b.tar.bz2 ug-nfc-efl-4dd4c8c90dcdf7cd521ab56618ebd4ca9152581b.zip | |
Update license file
Change-Id: Ic0422b9f286654090d9abeee5f515f8729869da2
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 |