From 0c0fa94e40e49c3b545bb8a7df954c5b727e8902 Mon Sep 17 00:00:00 2001 From: "w.nam" Date: Thu, 2 May 2013 11:40:21 +0900 Subject: [PATCH] change license version Change-Id: I0d6724be0b36682f68be14761d5544d4de201f2f --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 2 +- project/inc/GlesCanvasTexture.h | 2 +- project/src/GlesCanvasTexture.cpp | 2 +- project/src/GlesCanvasTextureEntry.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) mode change 100644 => 100755 LICENSE.Flora diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100644 new mode 100755 index fd90a36..571fe79 --- 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 diff --git a/NOTICE b/NOTICE index f37f329..2c574b9 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. +Except as noted, this software is licensed under Flora License, Version 1.1 Please, see the LICENSE.Flora file for Flora License terms and conditions. diff --git a/project/inc/GlesCanvasTexture.h b/project/inc/GlesCanvasTexture.h index 763ec75..8240628 100644 --- a/project/inc/GlesCanvasTexture.h +++ b/project/inc/GlesCanvasTexture.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2013 Samsung Electronics Co., Ltd. // -// 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 // diff --git a/project/src/GlesCanvasTexture.cpp b/project/src/GlesCanvasTexture.cpp index 5e3e22e..18942fc 100644 --- a/project/src/GlesCanvasTexture.cpp +++ b/project/src/GlesCanvasTexture.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2013 Samsung Electronics Co., Ltd. // -// 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 // diff --git a/project/src/GlesCanvasTextureEntry.cpp b/project/src/GlesCanvasTextureEntry.cpp index ac4c603..012b426 100644 --- a/project/src/GlesCanvasTextureEntry.cpp +++ b/project/src/GlesCanvasTextureEntry.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2013 Samsung Electronics Co., Ltd. // -// 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 // -- 2.7.4