diff options
author | Gongwook Lee <gongwook78.lee@samsung.com> | 2013-04-29 18:59:22 +0900 |
---|---|---|
committer | Gongwook Lee <gongwook78.lee@samsung.com> | 2013-04-29 18:59:22 +0900 |
commit | 45ca6693259fc6bd48237dae0a0478fc67d33a88 (patch) | |
tree | 0f574793413924add66d3e8dc3d14781d6378c70 | |
parent | 4d4dbfa338102150cbb53cedc28b307d61d44ae3 (diff) | |
download | QrCodeGenerator-45ca6693259fc6bd48237dae0a0478fc67d33a88.tar.gz QrCodeGenerator-45ca6693259fc6bd48237dae0a0478fc67d33a88.tar.bz2 QrCodeGenerator-45ca6693259fc6bd48237dae0a0478fc67d33a88.zip |
Fix flora license version
Change-Id: I6ed420d26d96a05c8a07d7e47cde76a2cf570ed1
Signed-off-by: Gongwook Lee <gongwook78.lee@samsung.com>
-rw-r--r--[-rwxr-xr-x] | LICENSE.Flora | 26 | ||||
-rw-r--r-- | NOTICE | 4 | ||||
-rw-r--r-- | project/inc/AppResourceId.h | 2 | ||||
-rw-r--r-- | project/inc/FileManagerForm.h | 2 | ||||
-rw-r--r-- | project/inc/GenerateForm.h | 2 | ||||
-rw-r--r-- | project/inc/MainMenuForm.h | 2 | ||||
-rw-r--r-- | project/inc/PanelCustom.h | 2 | ||||
-rw-r--r-- | project/inc/QrCodeGeneratorApp.h | 2 | ||||
-rw-r--r-- | project/inc/QrCodeGeneratorFormFactory.h | 2 | ||||
-rw-r--r-- | project/inc/QrCodeGeneratorPanelFactory.h | 2 | ||||
-rw-r--r-- | project/inc/QrData.h | 2 | ||||
-rw-r--r-- | project/inc/QrForm.h | 2 | ||||
-rw-r--r-- | project/src/AppResourceId.cpp | 2 | ||||
-rw-r--r-- | project/src/FileManagerForm.cpp | 2 | ||||
-rw-r--r-- | project/src/GenerateForm.cpp | 2 | ||||
-rw-r--r-- | project/src/MainMenuForm.cpp | 2 | ||||
-rw-r--r-- | project/src/PanelCustom.cpp | 2 | ||||
-rw-r--r-- | project/src/QrCodeGeneratorApp.cpp | 2 | ||||
-rw-r--r-- | project/src/QrCodeGeneratorAppEntry.cpp | 2 | ||||
-rw-r--r-- | project/src/QrCodeGeneratorFormFactory.cpp | 2 | ||||
-rw-r--r-- | project/src/QrCodeGeneratorPanelFactory.cpp | 2 | ||||
-rw-r--r-- | project/src/QrForm.cpp | 2 |
22 files changed, 35 insertions, 35 deletions
diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100755..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 @@ -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. -Please, see the LICENSE file for Flora License terms and conditions. +Except as noted, this software is licensed under Flora License, Version 1.1 +Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/project/inc/AppResourceId.h b/project/inc/AppResourceId.h index 06530ca..78286a6 100644 --- a/project/inc/AppResourceId.h +++ b/project/inc/AppResourceId.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/FileManagerForm.h b/project/inc/FileManagerForm.h index d2d4a8f..b62ccc9 100644 --- a/project/inc/FileManagerForm.h +++ b/project/inc/FileManagerForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/GenerateForm.h b/project/inc/GenerateForm.h index 49fca33..a9076fa 100644 --- a/project/inc/GenerateForm.h +++ b/project/inc/GenerateForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/MainMenuForm.h b/project/inc/MainMenuForm.h index cad8e3d..b705568 100644 --- a/project/inc/MainMenuForm.h +++ b/project/inc/MainMenuForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/PanelCustom.h b/project/inc/PanelCustom.h index 6db85c8..c3c3105 100644 --- a/project/inc/PanelCustom.h +++ b/project/inc/PanelCustom.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/QrCodeGeneratorApp.h b/project/inc/QrCodeGeneratorApp.h index 3a2c414..fc43dbe 100644 --- a/project/inc/QrCodeGeneratorApp.h +++ b/project/inc/QrCodeGeneratorApp.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/QrCodeGeneratorFormFactory.h b/project/inc/QrCodeGeneratorFormFactory.h index 9693f12..3d74c38 100644 --- a/project/inc/QrCodeGeneratorFormFactory.h +++ b/project/inc/QrCodeGeneratorFormFactory.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/QrCodeGeneratorPanelFactory.h b/project/inc/QrCodeGeneratorPanelFactory.h index 12c9d2b..f9823a8 100644 --- a/project/inc/QrCodeGeneratorPanelFactory.h +++ b/project/inc/QrCodeGeneratorPanelFactory.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/QrData.h b/project/inc/QrData.h index eab60c8..4dc161c 100644 --- a/project/inc/QrData.h +++ b/project/inc/QrData.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/inc/QrForm.h b/project/inc/QrForm.h index 080e64d..11105e0 100644 --- a/project/inc/QrForm.h +++ b/project/inc/QrForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/AppResourceId.cpp b/project/src/AppResourceId.cpp index af61aaa..b1803db 100644 --- a/project/src/AppResourceId.cpp +++ b/project/src/AppResourceId.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/FileManagerForm.cpp b/project/src/FileManagerForm.cpp index 031c544..af3cddf 100644 --- a/project/src/FileManagerForm.cpp +++ b/project/src/FileManagerForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/GenerateForm.cpp b/project/src/GenerateForm.cpp index e70f5fd..3d94eec 100644 --- a/project/src/GenerateForm.cpp +++ b/project/src/GenerateForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/MainMenuForm.cpp b/project/src/MainMenuForm.cpp index 4e06280..f1a6d54 100644 --- a/project/src/MainMenuForm.cpp +++ b/project/src/MainMenuForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/PanelCustom.cpp b/project/src/PanelCustom.cpp index 41ce508..d75f612 100644 --- a/project/src/PanelCustom.cpp +++ b/project/src/PanelCustom.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/QrCodeGeneratorApp.cpp b/project/src/QrCodeGeneratorApp.cpp index 2ec57ab..ca5e791 100644 --- a/project/src/QrCodeGeneratorApp.cpp +++ b/project/src/QrCodeGeneratorApp.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/QrCodeGeneratorAppEntry.cpp b/project/src/QrCodeGeneratorAppEntry.cpp index 81d1897..9209968 100644 --- a/project/src/QrCodeGeneratorAppEntry.cpp +++ b/project/src/QrCodeGeneratorAppEntry.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/QrCodeGeneratorFormFactory.cpp b/project/src/QrCodeGeneratorFormFactory.cpp index 9bf6314..59d85bf 100644 --- a/project/src/QrCodeGeneratorFormFactory.cpp +++ b/project/src/QrCodeGeneratorFormFactory.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/QrCodeGeneratorPanelFactory.cpp b/project/src/QrCodeGeneratorPanelFactory.cpp index 332466f..5534c5b 100644 --- a/project/src/QrCodeGeneratorPanelFactory.cpp +++ b/project/src/QrCodeGeneratorPanelFactory.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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/QrForm.cpp b/project/src/QrForm.cpp index a27a139..088098d 100644 --- a/project/src/QrForm.cpp +++ b/project/src/QrForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // Copyright (c) 2012 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 // |