[MultiProcUiApp] Change Flora license version

Change-Id: I4ee6dea5d3495c5314f2080da37acd904de7278f
Signed-off-by: Seokpil Park <seokpil.park@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
old mode 100755 (executable)
new mode 100644 (file)
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 fdb699a..94d56df 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,3 @@
 Copyright (c) 2012 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 9389984..b0a0b86 100644 (file)
--- 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/SampleServiceProxy.h b/project/inc/SampleServiceProxy.h
index 84971ab..00cee17 100644 (file)
--- a/project/inc/SampleServiceProxy.h
+++ b/project/inc/SampleServiceProxy.h
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleType.h b/project/inc/SampleType.h
index 1e91be9..be19d5d 100644 (file)
--- a/project/inc/SampleType.h
+++ b/project/inc/SampleType.h
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiApp.h b/project/inc/SampleUiApp.h
index 0d555d1..4006f2a 100644 (file)
--- a/project/inc/SampleUiApp.h
+++ b/project/inc/SampleUiApp.h
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiAppFrame.h b/project/inc/SampleUiAppFrame.h
index c5a7708..df78b89 100644 (file)
--- a/project/inc/SampleUiAppFrame.h
+++ b/project/inc/SampleUiAppFrame.h
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiAppMainForm.h b/project/inc/SampleUiAppMainForm.h
index 1304eef..eb30866 100644 (file)
--- a/project/inc/SampleUiAppMainForm.h
+++ b/project/inc/SampleUiAppMainForm.h
@@ -2,7 +2,7 @@
 // Tizen Native 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 e7fd131..6550b96 100644 (file)
--- 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/SampleServiceProxy.cpp b/project/src/SampleServiceProxy.cpp
index a3d72c0..31bc563 100644 (file)
--- a/project/src/SampleServiceProxy.cpp
+++ b/project/src/SampleServiceProxy.cpp
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiApp.cpp b/project/src/SampleUiApp.cpp
index c9c9fc5..5eba42e 100644 (file)
--- a/project/src/SampleUiApp.cpp
+++ b/project/src/SampleUiApp.cpp
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiAppEntry.cpp b/project/src/SampleUiAppEntry.cpp
index 6930802..ffd9896 100644 (file)
--- a/project/src/SampleUiAppEntry.cpp
+++ b/project/src/SampleUiAppEntry.cpp
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiAppFrame.cpp b/project/src/SampleUiAppFrame.cpp
index d544b69..a2afc5d 100644 (file)
--- a/project/src/SampleUiAppFrame.cpp
+++ b/project/src/SampleUiAppFrame.cpp
@@ -2,7 +2,7 @@
 // Tizen Native 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/SampleUiAppMainForm.cpp b/project/src/SampleUiAppMainForm.cpp
index 3fd305f..9bbece5 100644 (file)
--- a/project/src/SampleUiAppMainForm.cpp
+++ b/project/src/SampleUiAppMainForm.cpp
@@ -2,7 +2,7 @@
 // Tizen Native 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
 //