Updates license

Change-Id: I4c57d5ae6b138135e3d38ad1fa3fea0e4ecf72c7

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..571fe79 100755 (executable)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
 Flora License
 

-Version 1.0, April, 2013
+Version 1.1, April, 2013

 
 http://floralicense.org/license/
 
 
 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
      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
 
 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]
 
 
    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
 
    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 9ec42be..a5964ea 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
 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.Flora file for Flora License, Version 1 terms and conditions.
\ No newline at end of file
+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/inc/ClCalendarApp.h b/inc/ClCalendarApp.h
index ff90ec1..f7a87b1 100644 (file)
--- a/inc/ClCalendarApp.h
+++ b/inc/ClCalendarApp.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClCalendarListForm.h b/inc/ClCalendarListForm.h
index 67f90c0..59922bd 100644 (file)
--- a/inc/ClCalendarListForm.h
+++ b/inc/ClCalendarListForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClCalendarSelectorPopup.h b/inc/ClCalendarSelectorPopup.h
index 4f827d9..9066916 100644 (file)
--- a/inc/ClCalendarSelectorPopup.h
+++ b/inc/ClCalendarSelectorPopup.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClDayEventListForm.h b/inc/ClDayEventListForm.h
index ed9f2a6..f12109e 100644 (file)
--- a/inc/ClDayEventListForm.h
+++ b/inc/ClDayEventListForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClDayPanel.h b/inc/ClDayPanel.h
index b6bfe70..25e7d69 100644 (file)
--- a/inc/ClDayPanel.h
+++ b/inc/ClDayPanel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventDeleterForm.h b/inc/ClEventDeleterForm.h
index e191fc9..8e84354 100755 (executable)
--- a/inc/ClEventDeleterForm.h
+++ b/inc/ClEventDeleterForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventDetailsForm.h b/inc/ClEventDetailsForm.h
index 19fc6cb..57cc4f6 100644 (file)
--- a/inc/ClEventDetailsForm.h
+++ b/inc/ClEventDetailsForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventEditorForm.h b/inc/ClEventEditorForm.h
index 3fca127..0b62ae9 100644 (file)
--- a/inc/ClEventEditorForm.h
+++ b/inc/ClEventEditorForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventItem.h b/inc/ClEventItem.h
index 4032990..8739be9 100644 (file)
--- a/inc/ClEventItem.h
+++ b/inc/ClEventItem.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventListPresentationModel.h b/inc/ClEventListPresentationModel.h
index f3dad5f..f81f7f7 100644 (file)
--- a/inc/ClEventListPresentationModel.h
+++ b/inc/ClEventListPresentationModel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventPresentationModel.h b/inc/ClEventPresentationModel.h
index aa3e794..66044b3 100644 (file)
--- a/inc/ClEventPresentationModel.h
+++ b/inc/ClEventPresentationModel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventSearchPresentationModel.h b/inc/ClEventSearchPresentationModel.h
index 7d8250b..112bb6d 100644 (file)
--- a/inc/ClEventSearchPresentationModel.h
+++ b/inc/ClEventSearchPresentationModel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventSearcherForm.h b/inc/ClEventSearcherForm.h
index 23736a3..c6de182 100644 (file)
--- a/inc/ClEventSearcherForm.h
+++ b/inc/ClEventSearcherForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClEventSelectorForm.h b/inc/ClEventSelectorForm.h
index 90677c5..b0532c4 100644 (file)
--- a/inc/ClEventSelectorForm.h
+++ b/inc/ClEventSelectorForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClFormFactory.h b/inc/ClFormFactory.h
index 11bb96d..ca07f4d 100644 (file)
--- a/inc/ClFormFactory.h
+++ b/inc/ClFormFactory.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClGoToDatePopup.h b/inc/ClGoToDatePopup.h
index 9cdb1c3..70ec480 100644 (file)
--- a/inc/ClGoToDatePopup.h
+++ b/inc/ClGoToDatePopup.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClICalendarAppStatusChangedEventListener.h b/inc/ClICalendarAppStatusChangedEventListener.h
index 9ce51c0..c72d393 100644 (file)
--- a/inc/ClICalendarAppStatusChangedEventListener.h
+++ b/inc/ClICalendarAppStatusChangedEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClICalendarEventChangedEventListener.h b/inc/ClICalendarEventChangedEventListener.h
index 2a9f882..0c2c06d 100644 (file)
--- a/inc/ClICalendarEventChangedEventListener.h
+++ b/inc/ClICalendarEventChangedEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClICurrentDateChangedEventListener.h b/inc/ClICurrentDateChangedEventListener.h
index 27112c5..5265600 100644 (file)
--- a/inc/ClICurrentDateChangedEventListener.h
+++ b/inc/ClICurrentDateChangedEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClIDateFocusEventListener.h b/inc/ClIDateFocusEventListener.h
index f51858a..57d51fb 100644 (file)
--- a/inc/ClIDateFocusEventListener.h
+++ b/inc/ClIDateFocusEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClIEventActionEventListener.h b/inc/ClIEventActionEventListener.h
index c485ed3..90d4377 100644 (file)
--- a/inc/ClIEventActionEventListener.h
+++ b/inc/ClIEventActionEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClIPanningAnimationControlProvider.h b/inc/ClIPanningAnimationControlProvider.h
index efa21a7..01c34ee 100644 (file)
--- a/inc/ClIPanningAnimationControlProvider.h
+++ b/inc/ClIPanningAnimationControlProvider.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClIPanningAnimationEventListener.h b/inc/ClIPanningAnimationEventListener.h
index a7ebdda..9d92644 100644 (file)
--- a/inc/ClIPanningAnimationEventListener.h
+++ b/inc/ClIPanningAnimationEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClImportForm.h b/inc/ClImportForm.h
index 485353b..42598f9 100644 (file)
--- a/inc/ClImportForm.h
+++ b/inc/ClImportForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClListPanel.h b/inc/ClListPanel.h
index 6e5e172..deea348 100644 (file)
--- a/inc/ClListPanel.h
+++ b/inc/ClListPanel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClMainForm.h b/inc/ClMainForm.h
index 0d6a402..4884386 100644 (file)
--- a/inc/ClMainForm.h
+++ b/inc/ClMainForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClMainFrame.h b/inc/ClMainFrame.h
index 4e7eb22..f71c4af 100644 (file)
--- a/inc/ClMainFrame.h
+++ b/inc/ClMainFrame.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClMonthPanel.h b/inc/ClMonthPanel.h
index e7030d7..2986e7e 100644 (file)
--- a/inc/ClMonthPanel.h
+++ b/inc/ClMonthPanel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClNodes.h b/inc/ClNodes.h
index 6072a59..eb910b5 100644 (file)
--- a/inc/ClNodes.h
+++ b/inc/ClNodes.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClPanelFactory.h b/inc/ClPanelFactory.h
index 3497424..fd08d7c 100644 (file)
--- a/inc/ClPanelFactory.h
+++ b/inc/ClPanelFactory.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClPanningAnimationManager.h b/inc/ClPanningAnimationManager.h
index c0afa25..e138b8f 100644 (file)
--- a/inc/ClPanningAnimationManager.h
+++ b/inc/ClPanningAnimationManager.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClReminderForm.h b/inc/ClReminderForm.h
index ca63613..e6e17e3 100644 (file)
--- a/inc/ClReminderForm.h
+++ b/inc/ClReminderForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClRepeatForm.h b/inc/ClRepeatForm.h
index d558bda..3e79709 100644 (file)
--- a/inc/ClRepeatForm.h
+++ b/inc/ClRepeatForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClResourceManager.h b/inc/ClResourceManager.h
index 87e62bf..a2fb9e6 100644 (file)
--- a/inc/ClResourceManager.h
+++ b/inc/ClResourceManager.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClSceneRegister.h b/inc/ClSceneRegister.h
index b671fbb..22a0cf2 100644 (file)
--- a/inc/ClSceneRegister.h
+++ b/inc/ClSceneRegister.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClSettingForm.h b/inc/ClSettingForm.h
index 5bd039a..6b17278 100644 (file)
--- a/inc/ClSettingForm.h
+++ b/inc/ClSettingForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClSharePopup.h b/inc/ClSharePopup.h
index 9d1260a..d200c5f 100644 (file)
--- a/inc/ClSharePopup.h
+++ b/inc/ClSharePopup.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClTaskItem.h b/inc/ClTaskItem.h
index ee9c35b..656ff80 100644 (file)
--- a/inc/ClTaskItem.h
+++ b/inc/ClTaskItem.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClTaskSelectorForm.h b/inc/ClTaskSelectorForm.h
index f953772..09dc40b 100644 (file)
--- a/inc/ClTaskSelectorForm.h
+++ b/inc/ClTaskSelectorForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClThreeButtonPopup.h b/inc/ClThreeButtonPopup.h
index 5b12f39..68d1779 100644 (file)
--- a/inc/ClThreeButtonPopup.h
+++ b/inc/ClThreeButtonPopup.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClTwoButtonPopup.h b/inc/ClTwoButtonPopup.h
index 1833eb8..d99fe89 100644 (file)
--- a/inc/ClTwoButtonPopup.h
+++ b/inc/ClTwoButtonPopup.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClVcsSelectorForm.h b/inc/ClVcsSelectorForm.h
index 9d657ff..e7ecf1f 100644 (file)
--- a/inc/ClVcsSelectorForm.h
+++ b/inc/ClVcsSelectorForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/ClYearPanel.h b/inc/ClYearPanel.h
index 63a2a9f..7b2dbfd 100644 (file)
--- a/inc/ClYearPanel.h
+++ b/inc/ClYearPanel.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
index bf72870..d7da2d3 100644 (file)
--- a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
+++ b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml
@@ -3,25 +3,26 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">

-<ScenePopup Bversion="3.0.0.201212201745" Dversion="20120315">
+
+<ScenePopup Bversion="2.0.0.201304261605" Dversion="20120315">

     <Popup id="IDL_TWO_BUTTON_POPUP">
     <Popup id="IDL_TWO_BUTTON_POPUP">

-        <property color="" titleText="" titleTextColor=""/>
-        <layout height="278" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688"/>
-        <layout height="278" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688"/>
+        <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
+        <layout height="230.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688.0"/>
+        <layout height="278.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="688.0"/>

     </Popup>
     </Popup>

-    <Label id="IDC_LABEL" parent="IDL_TWO_BUTTON_POPUP">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="::IDS_COM_POP_DELETE_Q" textColor="" textSize="38" textStyle="LABEL_TEXT_STYLE_BOLD" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="160" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_TWO_BUTTON_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="160" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_TWO_BUTTON_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="0" y="0"/>
-    </Label>

     <Button id="IDC_BUTTON_DELETE" parent="IDL_TWO_BUTTON_POPUP">
     <Button id="IDC_BUTTON_DELETE" parent="IDL_TWO_BUTTON_POPUP">

-        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="#C24747" highlightedColorOpacity="100" highlightedTextColor="#FFFFFF" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#FFFFFF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="#FFFFFF" text="::IDS_CLD_SK3_DELETE" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24" marginLeft="20" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316" x="0" y="228"/>
-        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24" marginLeft="20" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316" x="0" y="228"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="#C24747" highlightedColorOpacity="100" highlightedTextColor="#FFFFFF" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#D05252" normalColorOpacity="100" normalTextColor="#FFFFFF" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="#C24747" pressedColorOpacity="100" pressedTextColor="#FFFFFF" text="::IDS_CLD_SK3_DELETE" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24.0" marginLeft="16.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="16.0" y="132.0"/>
+        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="24.0" marginLeft="20.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316.0" x="0.0" y="228.0"/>

     </Button>
     </Button>

+    <Label id="IDC_LABEL" parent="IDL_TWO_BUTTON_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="::IDS_COM_POP_DELETE_Q" textColor="" textSize="38.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDC_BUTTON_DELETE" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_TWO_BUTTON_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="16.0" marginRight="16.0" marginTop="32.0" mode="Portrait" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_TWO_BUTTON_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="32.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="160.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_TWO_BUTTON_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="0.0" y="0.0"/>
+    </Label>

     <Button id="IDC_BUTTON_CANCEL" parent="IDL_TWO_BUTTON_POPUP">
     <Button id="IDC_BUTTON_CANCEL" parent="IDL_TWO_BUTTON_POPUP">

-        <property disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_CLD_SK_CANCEL" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24" marginLeft="0" marginRight="20" marginTop="0" mode="Portrait" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316" x="352" y="228"/>
-        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24" marginLeft="0" marginRight="20" marginTop="0" mode="Landscape" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316" x="352" y="228"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_CLD_SK_CANCEL" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="318.0" x="354.0" y="132.0"/>
+        <layout bottomRelation="IDL_TWO_BUTTON_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="24.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_TWO_BUTTON_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="316.0" x="352.0" y="228.0"/>

     </Button>
 </ScenePopup>
     </Button>
 </ScenePopup>

diff --git a/src/ClCalendarApp.cpp b/src/ClCalendarApp.cpp
index f4e89a8..215e90f 100644 (file)
--- a/src/ClCalendarApp.cpp
+++ b/src/ClCalendarApp.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClCalendarEntry.cpp b/src/ClCalendarEntry.cpp
index aa4b565..355392e 100644 (file)
--- a/src/ClCalendarEntry.cpp
+++ b/src/ClCalendarEntry.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClCalendarListForm.cpp b/src/ClCalendarListForm.cpp
index 60856ee..76410d9 100644 (file)
--- a/src/ClCalendarListForm.cpp
+++ b/src/ClCalendarListForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClCalendarSelectorPopup.cpp b/src/ClCalendarSelectorPopup.cpp
index c1e6d5a..c1b895a 100644 (file)
--- a/src/ClCalendarSelectorPopup.cpp
+++ b/src/ClCalendarSelectorPopup.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //


@@ -47,7 +47,7 @@ static const int H_2_ITEMS_EVENT_LIST = 478;
 static const int H_3_ITEMS_EVENT_LIST = 620;
 static const int H_MANY_ITEMS_EVENT_LIST = 680;
 static const int H_ITEM = 140;
 static const int H_3_ITEMS_EVENT_LIST = 620;
 static const int H_MANY_ITEMS_EVENT_LIST = 680;
 static const int H_ITEM = 140;

-static const int X_CALENDAR_ICON = 16;
+static const int X_CALENDAR_ICON = 20;

 static const int Y_CALENDAR_ICON = 38;
 static const int W_CALENDAR_ICON = 64;
 static const int W_CALENDAR_ICON_MARGIN = 16;
 static const int Y_CALENDAR_ICON = 38;
 static const int W_CALENDAR_ICON = 64;
 static const int W_CALENDAR_ICON_MARGIN = 16;

diff --git a/src/ClDayEventListForm.cpp b/src/ClDayEventListForm.cpp
index 96b5982..d08f264 100644 (file)
--- a/src/ClDayEventListForm.cpp
+++ b/src/ClDayEventListForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp
index b00e2b0..08b4be6 100644 (file)
--- a/src/ClDayPanel.cpp
+++ b/src/ClDayPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index fcff4dd..189aa96 100755 (executable)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventDetailsForm.cpp b/src/ClEventDetailsForm.cpp
index 053a0a1..18a4be6 100644 (file)
--- a/src/ClEventDetailsForm.cpp
+++ b/src/ClEventDetailsForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp
index 600caac..8724a49 100644 (file)
--- a/src/ClEventEditorForm.cpp
+++ b/src/ClEventEditorForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventItem.cpp b/src/ClEventItem.cpp
index d91fbff..d3b7d19 100644 (file)
--- a/src/ClEventItem.cpp
+++ b/src/ClEventItem.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventListPresentationModel.cpp b/src/ClEventListPresentationModel.cpp
index 3a9afa0..2adc835 100644 (file)
--- a/src/ClEventListPresentationModel.cpp
+++ b/src/ClEventListPresentationModel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index 391b463..f775bde 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventSearchPresentationModel.cpp b/src/ClEventSearchPresentationModel.cpp
index 15de7ff..9e100a5 100644 (file)
--- a/src/ClEventSearchPresentationModel.cpp
+++ b/src/ClEventSearchPresentationModel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventSearcherForm.cpp b/src/ClEventSearcherForm.cpp
index 4f4609b..335e9ce 100644 (file)
--- a/src/ClEventSearcherForm.cpp
+++ b/src/ClEventSearcherForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClEventSelectorForm.cpp b/src/ClEventSelectorForm.cpp
index 58c59ad..875c591 100644 (file)
--- a/src/ClEventSelectorForm.cpp
+++ b/src/ClEventSelectorForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClFormFactory.cpp b/src/ClFormFactory.cpp
index ef5f09a..a75d686 100644 (file)
--- a/src/ClFormFactory.cpp
+++ b/src/ClFormFactory.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClGoToDatePopup.cpp b/src/ClGoToDatePopup.cpp
index cc65c8d..b41c546 100644 (file)
--- a/src/ClGoToDatePopup.cpp
+++ b/src/ClGoToDatePopup.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClImportForm.cpp b/src/ClImportForm.cpp
index 3557b12..bc85d06 100644 (file)
--- a/src/ClImportForm.cpp
+++ b/src/ClImportForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClListPanel.cpp b/src/ClListPanel.cpp
index a12905e..a7841e8 100644 (file)
--- a/src/ClListPanel.cpp
+++ b/src/ClListPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClMainForm.cpp b/src/ClMainForm.cpp
index ed18bd9..ac92b45 100644 (file)
--- a/src/ClMainForm.cpp
+++ b/src/ClMainForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClMainFrame.cpp b/src/ClMainFrame.cpp
index 61d2733..9739181 100644 (file)
--- a/src/ClMainFrame.cpp
+++ b/src/ClMainFrame.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp
index d9d3a43..91bf27a 100644 (file)
--- a/src/ClMonthPanel.cpp
+++ b/src/ClMonthPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClNodes.cpp b/src/ClNodes.cpp
index 73338c4..997751a 100644 (file)
--- a/src/ClNodes.cpp
+++ b/src/ClNodes.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClPanelFactory.cpp b/src/ClPanelFactory.cpp
index 8b7988c..c8a51b7 100644 (file)
--- a/src/ClPanelFactory.cpp
+++ b/src/ClPanelFactory.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClPanningAnimationManager.cpp b/src/ClPanningAnimationManager.cpp
index 1404987..33df77f 100644 (file)
--- a/src/ClPanningAnimationManager.cpp
+++ b/src/ClPanningAnimationManager.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp
index 4e37e98..0b9416f 100644 (file)
--- a/src/ClReminderForm.cpp
+++ b/src/ClReminderForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClRepeatForm.cpp b/src/ClRepeatForm.cpp
index 807d59a..d5a3fa5 100644 (file)
--- a/src/ClRepeatForm.cpp
+++ b/src/ClRepeatForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClResourceManager.cpp b/src/ClResourceManager.cpp
index 7151670..93cefbe 100644 (file)
--- a/src/ClResourceManager.cpp
+++ b/src/ClResourceManager.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClSceneRegister.cpp b/src/ClSceneRegister.cpp
index 783e8f4..4f49114 100644 (file)
--- a/src/ClSceneRegister.cpp
+++ b/src/ClSceneRegister.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClSharePopup.cpp b/src/ClSharePopup.cpp
index 7a0b802..7a0949a 100644 (file)
--- a/src/ClSharePopup.cpp
+++ b/src/ClSharePopup.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClTaskItem.cpp b/src/ClTaskItem.cpp
index 8275ec7..c41a794 100644 (file)
--- a/src/ClTaskItem.cpp
+++ b/src/ClTaskItem.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClThreeButtonPopup.cpp b/src/ClThreeButtonPopup.cpp
index 14ca18c..8738a42 100755 (executable)
--- a/src/ClThreeButtonPopup.cpp
+++ b/src/ClThreeButtonPopup.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClTwoButtonPopup.cpp b/src/ClTwoButtonPopup.cpp
index f79a3e8..3127b8b 100644 (file)
--- a/src/ClTwoButtonPopup.cpp
+++ b/src/ClTwoButtonPopup.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp
index a7f62d0..2074eaa 100644 (file)
--- a/src/ClYearPanel.cpp
+++ b/src/ClYearPanel.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 //
 // 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
 //
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //