From 46f5c91f697ba9ab1e480e4ec6b1050df255472d Mon Sep 17 00:00:00 2001 From: "w.nam" Date: Thu, 2 May 2013 11:20:04 +0900 Subject: [PATCH] change license version Change-Id: Ie3a72ae2e7c896030c2f148c27803501adbcd5bf --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 2 +- project/inc/DrawPanel.h | 2 +- project/inc/EffectsApp.h | 2 +- project/inc/EffectsAppFrame.h | 2 +- project/inc/EffectsBaseForm.h | 2 +- project/inc/FormFactory.h | 2 +- project/inc/InteractiveEffects.h | 2 +- project/inc/MainForm.h | 2 +- project/inc/PanelFactory.h | 2 +- project/inc/SceneChangeLogger.h | 2 +- project/inc/SceneRegister.h | 2 +- project/inc/SceneTransitionPolicyProvider.h | 2 +- project/inc/TimebasedEffects.h | 2 +- project/src/DrawPanel.cpp | 2 +- project/src/EffectsApp.cpp | 2 +- project/src/EffectsAppEntry.cpp | 2 +- project/src/EffectsAppFrame.cpp | 2 +- project/src/EffectsBaseForm.cpp | 2 +- project/src/FormFactory.cpp | 2 +- project/src/InteractiveEffects.cpp | 2 +- project/src/MainForm.cpp | 2 +- project/src/PanelFactory.cpp | 2 +- project/src/SceneChangeLogger.cpp | 2 +- project/src/SceneRegister.cpp | 2 +- project/src/SceneTransitionPolicyProvider.cpp | 2 +- project/src/TimebasedEffects.cpp | 2 +- 27 files changed, 39 insertions(+), 39 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 3997999..42ac28e 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 file for Flora License terms and conditions. diff --git a/project/inc/DrawPanel.h b/project/inc/DrawPanel.h index af870d9..8d1d897 100644 --- a/project/inc/DrawPanel.h +++ b/project/inc/DrawPanel.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/EffectsApp.h b/project/inc/EffectsApp.h index b2c6dbc..cc07589 100644 --- a/project/inc/EffectsApp.h +++ b/project/inc/EffectsApp.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/EffectsAppFrame.h b/project/inc/EffectsAppFrame.h index 99b6c93..9d95a4a 100644 --- a/project/inc/EffectsAppFrame.h +++ b/project/inc/EffectsAppFrame.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/EffectsBaseForm.h b/project/inc/EffectsBaseForm.h index d32e8aa..d0b2e36 100644 --- a/project/inc/EffectsBaseForm.h +++ b/project/inc/EffectsBaseForm.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/FormFactory.h b/project/inc/FormFactory.h index 9b76a74..2844b6c 100644 --- a/project/inc/FormFactory.h +++ b/project/inc/FormFactory.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/InteractiveEffects.h b/project/inc/InteractiveEffects.h index 8a19ded..efdda63 100644 --- a/project/inc/InteractiveEffects.h +++ b/project/inc/InteractiveEffects.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/MainForm.h b/project/inc/MainForm.h index dca4e07..5755b86 100644 --- a/project/inc/MainForm.h +++ b/project/inc/MainForm.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/PanelFactory.h b/project/inc/PanelFactory.h index ce57fde..c06e7e4 100644 --- a/project/inc/PanelFactory.h +++ b/project/inc/PanelFactory.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/SceneChangeLogger.h b/project/inc/SceneChangeLogger.h index 53f0ed0..a749672 100644 --- a/project/inc/SceneChangeLogger.h +++ b/project/inc/SceneChangeLogger.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/SceneRegister.h b/project/inc/SceneRegister.h index 83e3a4e..353080f 100644 --- a/project/inc/SceneRegister.h +++ b/project/inc/SceneRegister.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/SceneTransitionPolicyProvider.h b/project/inc/SceneTransitionPolicyProvider.h index 52299bf..ee49bf4 100644 --- a/project/inc/SceneTransitionPolicyProvider.h +++ b/project/inc/SceneTransitionPolicyProvider.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/TimebasedEffects.h b/project/inc/TimebasedEffects.h index f54b77e..5559a78 100644 --- a/project/inc/TimebasedEffects.h +++ b/project/inc/TimebasedEffects.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/DrawPanel.cpp b/project/src/DrawPanel.cpp index 1514eda..91704ae 100644 --- a/project/src/DrawPanel.cpp +++ b/project/src/DrawPanel.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/EffectsApp.cpp b/project/src/EffectsApp.cpp index d4498e8..7af077d 100644 --- a/project/src/EffectsApp.cpp +++ b/project/src/EffectsApp.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/EffectsAppEntry.cpp b/project/src/EffectsAppEntry.cpp index a6aa38a..899245b 100644 --- a/project/src/EffectsAppEntry.cpp +++ b/project/src/EffectsAppEntry.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/EffectsAppFrame.cpp b/project/src/EffectsAppFrame.cpp index c41c03c..63bb7bb 100644 --- a/project/src/EffectsAppFrame.cpp +++ b/project/src/EffectsAppFrame.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/EffectsBaseForm.cpp b/project/src/EffectsBaseForm.cpp index 780b75c..56593f7 100644 --- a/project/src/EffectsBaseForm.cpp +++ b/project/src/EffectsBaseForm.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/FormFactory.cpp b/project/src/FormFactory.cpp index 06ee3af..dfb497f 100644 --- a/project/src/FormFactory.cpp +++ b/project/src/FormFactory.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/InteractiveEffects.cpp b/project/src/InteractiveEffects.cpp index e34cdb5..c26a85f 100644 --- a/project/src/InteractiveEffects.cpp +++ b/project/src/InteractiveEffects.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/MainForm.cpp b/project/src/MainForm.cpp index ad30d55..5fa7763 100644 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.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/PanelFactory.cpp b/project/src/PanelFactory.cpp index 3e6ab0c..a48edf7 100644 --- a/project/src/PanelFactory.cpp +++ b/project/src/PanelFactory.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/SceneChangeLogger.cpp b/project/src/SceneChangeLogger.cpp index 8cf682d..88e1f84 100644 --- a/project/src/SceneChangeLogger.cpp +++ b/project/src/SceneChangeLogger.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/SceneRegister.cpp b/project/src/SceneRegister.cpp index c4eac4e..fd28734 100644 --- a/project/src/SceneRegister.cpp +++ b/project/src/SceneRegister.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/SceneTransitionPolicyProvider.cpp b/project/src/SceneTransitionPolicyProvider.cpp index eddabd3..9c05f96 100644 --- a/project/src/SceneTransitionPolicyProvider.cpp +++ b/project/src/SceneTransitionPolicyProvider.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/TimebasedEffects.cpp b/project/src/TimebasedEffects.cpp index 704b78a..1ac4259 100644 --- a/project/src/TimebasedEffects.cpp +++ b/project/src/TimebasedEffects.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 // -- 2.7.4