Change the License version from 1.0 into 1.1

Change-Id: I0d6381b377d9e4e632909fc165ed68c8ba5f635a
Signed-off-by: hs321.lee <hs321.lee@samsung.com>

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..571fe79 100644 (file)
--- 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 d490a67..e5d95db 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License, Version 1 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/CreateEventForm.h b/project/inc/CreateEventForm.h
index 5eb3784..d56e060 100644 (file)
--- a/project/inc/CreateEventForm.h
+++ b/project/inc/CreateEventForm.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/DeleteRecurringEventPopup.h b/project/inc/DeleteRecurringEventPopup.h
index 8dd8714..73a29df 100644 (file)
--- a/project/inc/DeleteRecurringEventPopup.h
+++ b/project/inc/DeleteRecurringEventPopup.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/EditEventForm.h b/project/inc/EditEventForm.h
index 3f8c03c..1cbdeca 100644 (file)
--- a/project/inc/EditEventForm.h
+++ b/project/inc/EditEventForm.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/EventDetailForm.h b/project/inc/EventDetailForm.h
index 781f749..ecf13ca 100644 (file)
--- a/project/inc/EventDetailForm.h
+++ b/project/inc/EventDetailForm.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/EventListForm.h b/project/inc/EventListForm.h
index 96bef71..d37070d 100644 (file)
--- a/project/inc/EventListForm.h
+++ b/project/inc/EventListForm.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/SceneRegister.h b/project/inc/SceneRegister.h
index aa05942..2fa333f 100644 (file)
--- a/project/inc/SceneRegister.h
+++ b/project/inc/SceneRegister.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/Scheduler.h b/project/inc/Scheduler.h
index ee59ced..74e1713 100644 (file)
--- a/project/inc/Scheduler.h
+++ b/project/inc/Scheduler.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/SchedulerFormFactory.h b/project/inc/SchedulerFormFactory.h
index 9beef8a..71e80e4 100644 (file)
--- a/project/inc/SchedulerFormFactory.h
+++ b/project/inc/SchedulerFormFactory.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/SelectCalendarPopup.h b/project/inc/SelectCalendarPopup.h
index 546ecf0..16c03cd 100644 (file)
--- a/project/inc/SelectCalendarPopup.h
+++ b/project/inc/SelectCalendarPopup.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/inc/SetRecurrenceForm.h b/project/inc/SetRecurrenceForm.h
index cddc3bd..06f0a70 100644 (file)
--- a/project/inc/SetRecurrenceForm.h
+++ b/project/inc/SetRecurrenceForm.h
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/CreateEventForm.cpp b/project/src/CreateEventForm.cpp
index c6f4659..f864c13 100644 (file)
--- a/project/src/CreateEventForm.cpp
+++ b/project/src/CreateEventForm.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/DeleteRecurringEventPopup.cpp b/project/src/DeleteRecurringEventPopup.cpp
index da48323..4b493ac 100644 (file)
--- a/project/src/DeleteRecurringEventPopup.cpp
+++ b/project/src/DeleteRecurringEventPopup.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/EditEventForm.cpp b/project/src/EditEventForm.cpp
index a21d1eb..4380685 100644 (file)
--- a/project/src/EditEventForm.cpp
+++ b/project/src/EditEventForm.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/EventDetailForm.cpp b/project/src/EventDetailForm.cpp
index 6f9b5ad..850000b 100644 (file)
--- a/project/src/EventDetailForm.cpp
+++ b/project/src/EventDetailForm.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/EventListForm.cpp b/project/src/EventListForm.cpp
index 3f963b0..15e0d29 100644 (file)
--- a/project/src/EventListForm.cpp
+++ b/project/src/EventListForm.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SceneRegister.cpp b/project/src/SceneRegister.cpp
index 8d13e83..3b7b729 100644 (file)
--- a/project/src/SceneRegister.cpp
+++ b/project/src/SceneRegister.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/Scheduler.cpp b/project/src/Scheduler.cpp
index 19f377e..8a457ae 100644 (file)
--- a/project/src/Scheduler.cpp
+++ b/project/src/Scheduler.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SchedulerEntry.cpp b/project/src/SchedulerEntry.cpp
index 0d48241..f07fbe2 100644 (file)
--- a/project/src/SchedulerEntry.cpp
+++ b/project/src/SchedulerEntry.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SchedulerFormFactory.cpp b/project/src/SchedulerFormFactory.cpp
index 2849464..1ff4611 100644 (file)
--- a/project/src/SchedulerFormFactory.cpp
+++ b/project/src/SchedulerFormFactory.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SchedulerFrame.cpp b/project/src/SchedulerFrame.cpp
index dfe8648..11d6f6d 100644 (file)
--- a/project/src/SchedulerFrame.cpp
+++ b/project/src/SchedulerFrame.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SelectCalendarPopup.cpp b/project/src/SelectCalendarPopup.cpp
index 472d7f3..76cff31 100644 (file)
--- a/project/src/SelectCalendarPopup.cpp
+++ b/project/src/SelectCalendarPopup.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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/SetRecurrenceForm.cpp b/project/src/SetRecurrenceForm.cpp
index 2eb6424..ab9070b 100644 (file)
--- a/project/src/SetRecurrenceForm.cpp
+++ b/project/src/SetRecurrenceForm.cpp
@@ -1,8 +1,7 @@
 //
-// Open Service Platform
 // 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
 //