Flora license update

Change-Id: Iacd60a06d5da1485655cc19eedce0b3026dcba3b

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
 
-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 1b25bce..a5964ea 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.0.
-Please, see the LICENSE.Flora file for Flora License, Version 1.0 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/edc/cam_ctxpopup_shortcuts.edc b/edc/cam_ctxpopup_shortcuts.edc
index ea06b17..8de32fc 100755 (executable)
--- a/edc/cam_ctxpopup_shortcuts.edc
+++ b/edc/cam_ctxpopup_shortcuts.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_ctxpopup_shortcuts_inc.edc b/edc/cam_ctxpopup_shortcuts_inc.edc
index 1e3837e..8889e36 100755 (executable)
--- a/edc/cam_ctxpopup_shortcuts_inc.edc
+++ b/edc/cam_ctxpopup_shortcuts_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_ev_layout.edc b/edc/cam_ev_layout.edc
index a0f951e..45662d6 100755 (executable)
--- a/edc/cam_ev_layout.edc
+++ b/edc/cam_ev_layout.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_ev_layout_inverse.edc b/edc/cam_ev_layout_inverse.edc
index 0796343..c2c77f7 100755 (executable)
--- a/edc/cam_ev_layout_inverse.edc
+++ b/edc/cam_ev_layout_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_ev_layout_vertical.edc b/edc/cam_ev_layout_vertical.edc
index c7f83bc..395b6ca 100755 (executable)
--- a/edc/cam_ev_layout_vertical.edc
+++ b/edc/cam_ev_layout_vertical.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_ev_layout_vertical_inverse.edc b/edc/cam_ev_layout_vertical_inverse.edc
index 59f8c66..8aff53c 100755 (executable)
--- a/edc/cam_ev_layout_vertical_inverse.edc
+++ b/edc/cam_ev_layout_vertical_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_funcs.edc b/edc/cam_funcs.edc
old mode 100644 (file)
new mode 100755 (executable)
index 0812635..06bc800
--- a/edc/cam_funcs.edc
+++ b/edc/cam_funcs.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_guideline_edje.edc b/edc/cam_guideline_edje.edc
old mode 100644 (file)
new mode 100755 (executable)
index 8a31bae..20c9f57
--- a/edc/cam_guideline_edje.edc
+++ b/edc/cam_guideline_edje.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_images.edc b/edc/cam_images.edc
index 9c90139..a51397a 100755 (executable)
--- a/edc/cam_images.edc
+++ b/edc/cam_images.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_indicator_layout.edc b/edc/cam_indicator_layout.edc
index dd613f2..debe3d7 100755 (executable)
--- a/edc/cam_indicator_layout.edc
+++ b/edc/cam_indicator_layout.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_main_layout.edc b/edc/cam_main_layout.edc
index 8688684..b555771 100755 (executable)
--- a/edc/cam_main_layout.edc
+++ b/edc/cam_main_layout.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_recording_edje.edc b/edc/cam_recording_edje.edc
index 467bfb0..5af9fd3 100755 (executable)
--- a/edc/cam_recording_edje.edc
+++ b/edc/cam_recording_edje.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_recording_edje_inc.edc b/edc/cam_recording_edje_inc.edc
index 523836b..727c92f 100755 (executable)
--- a/edc/cam_recording_edje_inc.edc
+++ b/edc/cam_recording_edje_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_recording_edje_inverse.edc b/edc/cam_recording_edje_inverse.edc
index 7fce4b2..3b7269b 100755 (executable)
--- a/edc/cam_recording_edje_inverse.edc
+++ b/edc/cam_recording_edje_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_recording_edje_inverse_inc.edc b/edc/cam_recording_edje_inverse_inc.edc
index 37f84b2..a910913 100755 (executable)
--- a/edc/cam_recording_edje_inverse_inc.edc
+++ b/edc/cam_recording_edje_inverse_inc.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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
  *
@@ -12,27 +12,27 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */\r
-\r
-#include "../include/edc_image_name.h"\r
-#include "cam_funcs.edc"\r
-images {\r
-       image: RECORDING_IMAGE_REC_IMAGE COMP;\r
-}\r
-\r
-\r
-#define RECORDING_IMAGE_X 844\r
-#define RECORDING_IMAGE_Y 12\r
-#define RECORDING_IMAGE_W 48\r
-#define RECORDING_IMAGE_H 48\r
-#define RECORDING_TEXT_X 734\r
-#define RECORDING_TEXT_Y 12\r
-#define RECORDING_LEFT_TEXT_X 128\r
-#define RECORDING_LEFT_TEXT_Y 10\r
-\r
-#define PROGRESS_BAR_X 320\r
-#define PROGRESS_BAR_Y 657\r
-#define PROGRESS_BAR_W 639\r
-#define PROGRESS_BAR_H 20\r
-\r
+ */
+
+#include "../include/edc_image_name.h"
+#include "cam_funcs.edc"
+images {
+       image: RECORDING_IMAGE_REC_IMAGE COMP;
+}
+
+
+#define RECORDING_IMAGE_X 844
+#define RECORDING_IMAGE_Y 12
+#define RECORDING_IMAGE_W 48
+#define RECORDING_IMAGE_H 48
+#define RECORDING_TEXT_X 734
+#define RECORDING_TEXT_Y 12
+#define RECORDING_LEFT_TEXT_X 128
+#define RECORDING_LEFT_TEXT_Y 10
+
+#define PROGRESS_BAR_X 320
+#define PROGRESS_BAR_Y 657
+#define PROGRESS_BAR_W 639
+#define PROGRESS_BAR_H 20
+
 //endfiles
\ No newline at end of file

diff --git a/edc/cam_recording_edje_vertical.edc b/edc/cam_recording_edje_vertical.edc
index 3befe35..1234ac9 100755 (executable)
--- a/edc/cam_recording_edje_vertical.edc
+++ b/edc/cam_recording_edje_vertical.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_recording_edje_vertical_inc.edc b/edc/cam_recording_edje_vertical_inc.edc
index cf0e171..1a450ee 100755 (executable)
--- a/edc/cam_recording_edje_vertical_inc.edc
+++ b/edc/cam_recording_edje_vertical_inc.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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
  *
@@ -12,28 +12,28 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */\r
-\r
-\r
-#include "../include/edc_image_name.h"\r
-#include "cam_funcs.edc"\r
-images {\r
-       image: RECORDING_IMAGE_REC_IMAGE COMP;\r
-}\r
-\r
-\r
-#define RECORDING_IMAGE_X 460\r
-#define RECORDING_IMAGE_Y 28\r
-#define RECORDING_IMAGE_W 48\r
-#define RECORDING_IMAGE_H 48\r
-#define RECORDING_TEXT_X 350\r
-#define RECORDING_TEXT_Y 28\r
-#define RECORDING_LEFT_TEXT_X 10\r
-#define RECORDING_LEFT_TEXT_Y 28\r
-\r
-#define PROGRESS_BAR_X 128\r
-#define PROGRESS_BAR_Y 1000\r
-#define PROGRESS_BAR_W 464\r
-#define PROGRESS_BAR_H 20\r
-\r
+ */
+
+
+#include "../include/edc_image_name.h"
+#include "cam_funcs.edc"
+images {
+       image: RECORDING_IMAGE_REC_IMAGE COMP;
+}
+
+
+#define RECORDING_IMAGE_X 460
+#define RECORDING_IMAGE_Y 28
+#define RECORDING_IMAGE_W 48
+#define RECORDING_IMAGE_H 48
+#define RECORDING_TEXT_X 350
+#define RECORDING_TEXT_Y 28
+#define RECORDING_LEFT_TEXT_X 10
+#define RECORDING_LEFT_TEXT_Y 28
+
+#define PROGRESS_BAR_X 128
+#define PROGRESS_BAR_Y 1000
+#define PROGRESS_BAR_W 464
+#define PROGRESS_BAR_H 20
+
 //endfiles
\ No newline at end of file

diff --git a/edc/cam_recording_edje_vertical_inverse.edc b/edc/cam_recording_edje_vertical_inverse.edc
index 53f402f..98e958a 100755 (executable)
--- a/edc/cam_recording_edje_vertical_inverse.edc
+++ b/edc/cam_recording_edje_vertical_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_recording_edje_vertical_inverse_inc.edc b/edc/cam_recording_edje_vertical_inverse_inc.edc
index 0f88b2d..446acea 100755 (executable)
--- a/edc/cam_recording_edje_vertical_inverse_inc.edc
+++ b/edc/cam_recording_edje_vertical_inverse_inc.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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
  *
@@ -12,27 +12,27 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */\r
-\r
-\r
-#include "../include/edc_image_name.h"\r
-#include "cam_funcs.edc"\r
-images {\r
-       image: RECORDING_IMAGE_REC_IMAGE COMP;\r
-}\r
-\r
-#define RECORDING_IMAGE_X 460\r
-#define RECORDING_IMAGE_Y 172\r
-#define RECORDING_IMAGE_W 48\r
-#define RECORDING_IMAGE_H 48\r
-#define RECORDING_TEXT_X 350\r
-#define RECORDING_TEXT_Y 172\r
-#define RECORDING_LEFT_TEXT_X 10\r
-#define RECORDING_LEFT_TEXT_Y 28\r
+ */
+
+
+#include "../include/edc_image_name.h"
+#include "cam_funcs.edc"
+images {
+       image: RECORDING_IMAGE_REC_IMAGE COMP;
+}
+
+#define RECORDING_IMAGE_X 460
+#define RECORDING_IMAGE_Y 172
+#define RECORDING_IMAGE_W 48
+#define RECORDING_IMAGE_H 48
+#define RECORDING_TEXT_X 350
+#define RECORDING_TEXT_Y 172
+#define RECORDING_LEFT_TEXT_X 10
+#define RECORDING_LEFT_TEXT_Y 28
+
+#define PROGRESS_BAR_X 128
+#define PROGRESS_BAR_Y 1000
+#define PROGRESS_BAR_W 464
+#define PROGRESS_BAR_H 20
 
-#define PROGRESS_BAR_X 128\r
-#define PROGRESS_BAR_Y 1000\r
-#define PROGRESS_BAR_W 464\r
-#define PROGRESS_BAR_H 20\r
-\r
 //endfiles
\ No newline at end of file

diff --git a/edc/cam_setting_popup_layout.edc b/edc/cam_setting_popup_layout.edc
old mode 100644 (file)
new mode 100755 (executable)
index b10430b..21b22b1
--- a/edc/cam_setting_popup_layout.edc
+++ b/edc/cam_setting_popup_layout.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_setting_popup_layout_inc.edc b/edc/cam_setting_popup_layout_inc.edc
index fd9f835..d32da91 100755 (executable)
--- a/edc/cam_setting_popup_layout_inc.edc
+++ b/edc/cam_setting_popup_layout_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_toolbar_layout.edc b/edc/cam_toolbar_layout.edc
index ead32b2..5be5582 100755 (executable)
--- a/edc/cam_toolbar_layout.edc
+++ b/edc/cam_toolbar_layout.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_toolbar_layout_inc.edc b/edc/cam_toolbar_layout_inc.edc
index a346f72..ae6e1c8 100755 (executable)
--- a/edc/cam_toolbar_layout_inc.edc
+++ b/edc/cam_toolbar_layout_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_toolbar_layout_inverse.edc b/edc/cam_toolbar_layout_inverse.edc
index 327fc70..5dd92d1 100755 (executable)
--- a/edc/cam_toolbar_layout_inverse.edc
+++ b/edc/cam_toolbar_layout_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_toolbar_layout_inverse_inc.edc b/edc/cam_toolbar_layout_inverse_inc.edc
index e06ed88..448631c 100755 (executable)
--- a/edc/cam_toolbar_layout_inverse_inc.edc
+++ b/edc/cam_toolbar_layout_inverse_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_toolbar_layout_vertical.edc b/edc/cam_toolbar_layout_vertical.edc
index 0b4c0ed..1b21d76 100755 (executable)
--- a/edc/cam_toolbar_layout_vertical.edc
+++ b/edc/cam_toolbar_layout_vertical.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_toolbar_layout_vertical_inc.edc b/edc/cam_toolbar_layout_vertical_inc.edc
index c2c6ace..f5099ff 100755 (executable)
--- a/edc/cam_toolbar_layout_vertical_inc.edc
+++ b/edc/cam_toolbar_layout_vertical_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_toolbar_layout_vertical_inverse.edc b/edc/cam_toolbar_layout_vertical_inverse.edc
index 4eb028b..c84ee63 100755 (executable)
--- a/edc/cam_toolbar_layout_vertical_inverse.edc
+++ b/edc/cam_toolbar_layout_vertical_inverse.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_toolbar_layout_vertical_inverse_inc.edc b/edc/cam_toolbar_layout_vertical_inverse_inc.edc
index 884fb27..827ee9c 100755 (executable)
--- a/edc/cam_toolbar_layout_vertical_inverse_inc.edc
+++ b/edc/cam_toolbar_layout_vertical_inverse_inc.edc
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/edc/cam_utils.edc b/edc/cam_utils.edc
index e451a9b..3a213db 100755 (executable)
--- a/edc/cam_utils.edc
+++ b/edc/cam_utils.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_zoom_layout.edc b/edc/cam_zoom_layout.edc
index 216356d..06edd50 100755 (executable)
--- a/edc/cam_zoom_layout.edc
+++ b/edc/cam_zoom_layout.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_zoom_layout_inverse.edc b/edc/cam_zoom_layout_inverse.edc
index 8193260..8eefd89 100755 (executable)
--- a/edc/cam_zoom_layout_inverse.edc
+++ b/edc/cam_zoom_layout_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_zoom_layout_vertical.edc b/edc/cam_zoom_layout_vertical.edc
index b6f0a37..68df3a1 100755 (executable)
--- a/edc/cam_zoom_layout_vertical.edc
+++ b/edc/cam_zoom_layout_vertical.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/cam_zoom_layout_vertical_inverse.edc b/edc/cam_zoom_layout_vertical_inverse.edc
index 5d02699..2b07bc0 100755 (executable)
--- a/edc/cam_zoom_layout_vertical_inverse.edc
+++ b/edc/cam_zoom_layout_vertical_inverse.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_button_camera.edc b/edc/style_button_camera.edc
old mode 100644 (file)
new mode 100755 (executable)
index fd815ef..fe51a1a
--- a/edc/style_button_camera.edc
+++ b/edc/style_button_camera.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_ctxpopup_camera_with_radio.edc b/edc/style_ctxpopup_camera_with_radio.edc
index f2715e7..baa3ac6 100755 (executable)
--- a/edc/style_ctxpopup_camera_with_radio.edc
+++ b/edc/style_ctxpopup_camera_with_radio.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_genlist_macro.edc b/edc/style_genlist_macro.edc
index 07c49fa..72b46db 100755 (executable)
--- a/edc/style_genlist_macro.edc
+++ b/edc/style_genlist_macro.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_genlist_normal.edc b/edc/style_genlist_normal.edc
old mode 100644 (file)
new mode 100755 (executable)
index ff22033..7d0eeb2
--- a/edc/style_genlist_normal.edc
+++ b/edc/style_genlist_normal.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_label_camera.edc b/edc/style_label_camera.edc
old mode 100644 (file)
new mode 100755 (executable)
index 55ff6f9..c7fb7be
--- a/edc/style_label_camera.edc
+++ b/edc/style_label_camera.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_slider_camera.edc b/edc/style_slider_camera.edc
index 57cac35..0d2bd99 100755 (executable)
--- a/edc/style_slider_camera.edc
+++ b/edc/style_slider_camera.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/edc/style_tizen_hd_inc.edc b/edc/style_tizen_hd_inc.edc
old mode 100644 (file)
new mode 100755 (executable)
index 9fd95a3..a1c2d57
--- a/edc/style_tizen_hd_inc.edc
+++ b/edc/style_tizen_hd_inc.edc
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/CamDeviceCapacity.h b/include/CamDeviceCapacity.h
old mode 100644 (file)
new mode 100755 (executable)
index 0e80832..72fb09d
--- a/include/CamDeviceCapacity.h
+++ b/include/CamDeviceCapacity.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/CamTypeConverter.h b/include/CamTypeConverter.h
index c78bd7e..699fee5 100755 (executable)
--- a/include/CamTypeConverter.h
+++ b/include/CamTypeConverter.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam.h b/include/cam.h
index 5ff9058..cb1aba9 100755 (executable)
--- a/include/cam.h
+++ b/include/cam.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_animation.h b/include/cam_animation.h
old mode 100644 (file)
new mode 100755 (executable)
index f6a3d92..013b938
--- a/include/cam_animation.h
+++ b/include/cam_animation.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_app.h b/include/cam_app.h
index 40d6ee6..edc040d 100755 (executable)
--- a/include/cam_app.h
+++ b/include/cam_app.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_capacity_type.h b/include/cam_capacity_type.h
index 69c97c2..2635c5f 100755 (executable)
--- a/include/cam_capacity_type.h
+++ b/include/cam_capacity_type.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_config.h b/include/cam_config.h
index 8c3b43f..23278cc 100755 (executable)
--- a/include/cam_config.h
+++ b/include/cam_config.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_continuous_shot.h b/include/cam_continuous_shot.h
index acffc3b..941942d 100755 (executable)
--- a/include/cam_continuous_shot.h
+++ b/include/cam_continuous_shot.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_debug.h b/include/cam_debug.h
index a279c08..007663c 100755 (executable)
--- a/include/cam_debug.h
+++ b/include/cam_debug.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_device_capacity.h b/include/cam_device_capacity.h
index 39833da..eaacb23 100755 (executable)
--- a/include/cam_device_capacity.h
+++ b/include/cam_device_capacity.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_error.h b/include/cam_error.h
index 09ad3e2..cd8ae97 100755 (executable)
--- a/include/cam_error.h
+++ b/include/cam_error.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_exif_info.h b/include/cam_exif_info.h
old mode 100644 (file)
new mode 100755 (executable)
index 0bdf820..98657ea
--- a/include/cam_exif_info.h
+++ b/include/cam_exif_info.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_face_detection_focus.h b/include/cam_face_detection_focus.h
old mode 100644 (file)
new mode 100755 (executable)
index 218f5aa..96fc581
--- a/include/cam_face_detection_focus.h
+++ b/include/cam_face_detection_focus.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_file.h b/include/cam_file.h
index 605eb66..00593ab 100755 (executable)
--- a/include/cam_file.h
+++ b/include/cam_file.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_lbs.h b/include/cam_lbs.h
index 122b2d4..afe27a8 100755 (executable)
--- a/include/cam_lbs.h
+++ b/include/cam_lbs.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_long_press.h b/include/cam_long_press.h
old mode 100644 (file)
new mode 100755 (executable)
index 0c0014a..f2f8666
--- a/include/cam_long_press.h
+++ b/include/cam_long_press.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_menu_composer.h b/include/cam_menu_composer.h
index ae586ba..d897dcd 100755 (executable)
--- a/include/cam_menu_composer.h
+++ b/include/cam_menu_composer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_mm.h b/include/cam_mm.h
index b7bda5f..694390b 100755 (executable)
--- a/include/cam_mm.h
+++ b/include/cam_mm.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_popup.h b/include/cam_popup.h
index 97540f6..7da6fec 100755 (executable)
--- a/include/cam_popup.h
+++ b/include/cam_popup.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_property.h b/include/cam_property.h
index 38cf3e7..c2ffd35 100755 (executable)
--- a/include/cam_property.h
+++ b/include/cam_property.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_rec.h b/include/cam_rec.h
index 3fb241e..81de3bd 100755 (executable)
--- a/include/cam_rec.h
+++ b/include/cam_rec.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_sound.h b/include/cam_sound.h
index 819468c..89f11af 100755 (executable)
--- a/include/cam_sound.h
+++ b/include/cam_sound.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_ta.h b/include/cam_ta.h
index 2064ab4..d89411d 100755 (executable)
--- a/include/cam_ta.h
+++ b/include/cam_ta.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_typeconverter.h b/include/cam_typeconverter.h
old mode 100644 (file)
new mode 100755 (executable)
index 55e37cb..ffdc4f6
--- a/include/cam_typeconverter.h
+++ b/include/cam_typeconverter.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/cam_ui_effect_utils.h b/include/cam_ui_effect_utils.h
old mode 100644 (file)
new mode 100755 (executable)
index 28a181d..a3d4f94
--- a/include/cam_ui_effect_utils.h
+++ b/include/cam_ui_effect_utils.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_ui_rotate_utils.h b/include/cam_ui_rotate_utils.h
old mode 100644 (file)
new mode 100755 (executable)
index 04f874d..2c683f9
--- a/include/cam_ui_rotate_utils.h
+++ b/include/cam_ui_rotate_utils.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/cam_voice_command.h b/include/cam_voice_command.h
old mode 100644 (file)
new mode 100755 (executable)
index 4a507a1..5c831b8
--- a/include/cam_voice_command.h
+++ b/include/cam_voice_command.h
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/include/camera_utils.h b/include/camera_utils.h
index 36e7da3..98ae2a3 100755 (executable)
--- a/include/camera_utils.h
+++ b/include/camera_utils.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_common_edc_callback.h b/include/edc-callback/cam_common_edc_callback.h
index 9b4f626..e809d0e 100755 (executable)
--- a/include/edc-callback/cam_common_edc_callback.h
+++ b/include/edc-callback/cam_common_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_ev_edc_callback.h b/include/edc-callback/cam_ev_edc_callback.h
index 8274c82..f4c4a60 100755 (executable)
--- a/include/edc-callback/cam_ev_edc_callback.h
+++ b/include/edc-callback/cam_ev_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_indicator_edc_callback.h b/include/edc-callback/cam_indicator_edc_callback.h
index 6cd69f4..b9de17b 100755 (executable)
--- a/include/edc-callback/cam_indicator_edc_callback.h
+++ b/include/edc-callback/cam_indicator_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_recording_edc_callback.h b/include/edc-callback/cam_recording_edc_callback.h
index f6e702d..c30a4d4 100755 (executable)
--- a/include/edc-callback/cam_recording_edc_callback.h
+++ b/include/edc-callback/cam_recording_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_toolbar_edc_callback.h b/include/edc-callback/cam_toolbar_edc_callback.h
index 90f0f18..b07facc 100755 (executable)
--- a/include/edc-callback/cam_toolbar_edc_callback.h
+++ b/include/edc-callback/cam_toolbar_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc-callback/cam_zoom_edc_callback.h b/include/edc-callback/cam_zoom_edc_callback.h
index 34d9774..4af204b 100755 (executable)
--- a/include/edc-callback/cam_zoom_edc_callback.h
+++ b/include/edc-callback/cam_zoom_edc_callback.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc_image_name.h b/include/edc_image_name.h
index 7b19d7a..683ce07 100755 (executable)
--- a/include/edc_image_name.h
+++ b/include/edc_image_name.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/include/edc_string.h b/include/edc_string.h
index 5708940..ef18f14 100755 (executable)
--- a/include/edc_string.h
+++ b/include/edc_string.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/packaging/ug-camera-efl.spec b/packaging/ug-camera-efl.spec
index 078d86d..69b21cd 100644 (file)
--- a/packaging/ug-camera-efl.spec
+++ b/packaging/ug-camera-efl.spec
@@ -7,7 +7,7 @@
 
 Name:       ug-camera-efl
 Summary:    SLP Camera UI Gadget
-Version:    0.1.111
+Version:    0.1.112
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License

diff --git a/src/CamDeviceCapacity.cpp b/src/CamDeviceCapacity.cpp
index 0aa4026..55158d3 100755 (executable)
--- a/src/CamDeviceCapacity.cpp
+++ b/src/CamDeviceCapacity.cpp
@@ -2,7 +2,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/CamTypeConverter.cpp b/src/CamTypeConverter.cpp
index 732ef73..b403a8a 100755 (executable)
--- a/src/CamTypeConverter.cpp
+++ b/src/CamTypeConverter.cpp
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam.c b/src/cam.c
index cbbea46..15cd62a 100755 (executable)
--- a/src/cam.c
+++ b/src/cam.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_animation.c b/src/cam_animation.c
index 42b9fd4..f20517c 100755 (executable)
--- a/src/cam_animation.c
+++ b/src/cam_animation.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_app.c b/src/cam_app.c
index 4d927ea..d04773d 100755 (executable)
--- a/src/cam_app.c
+++ b/src/cam_app.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_config.c b/src/cam_config.c
old mode 100644 (file)
new mode 100755 (executable)
index 02fc71b..c929864
--- a/src/cam_config.c
+++ b/src/cam_config.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_continuous_shot.c b/src/cam_continuous_shot.c
index ad3ea13..9056983 100755 (executable)
--- a/src/cam_continuous_shot.c
+++ b/src/cam_continuous_shot.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_debug.c b/src/cam_debug.c
index 6b3c66c..6ec53fa 100755 (executable)
--- a/src/cam_debug.c
+++ b/src/cam_debug.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_device_capacity.cpp b/src/cam_device_capacity.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8f901e4..6bbced2
--- a/src/cam_device_capacity.cpp
+++ b/src/cam_device_capacity.cpp
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_exif_info.c b/src/cam_exif_info.c
old mode 100644 (file)
new mode 100755 (executable)
index 12702c1..ebad409
--- a/src/cam_exif_info.c
+++ b/src/cam_exif_info.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_face_detection_focus.c b/src/cam_face_detection_focus.c
old mode 100644 (file)
new mode 100755 (executable)
index 49c98f1..1b1665d
--- a/src/cam_face_detection_focus.c
+++ b/src/cam_face_detection_focus.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_file.c b/src/cam_file.c
index 2a6adb3..5f965a0 100755 (executable)
--- a/src/cam_file.c
+++ b/src/cam_file.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_lbs.c b/src/cam_lbs.c
index 3edb8ee..453fd94 100755 (executable)
--- a/src/cam_lbs.c
+++ b/src/cam_lbs.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_long_press.c b/src/cam_long_press.c
index 28a0658..efdb0ec 100755 (executable)
--- a/src/cam_long_press.c
+++ b/src/cam_long_press.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_menu_composer.c b/src/cam_menu_composer.c
index 26fe5c9..ae3045c 100755 (executable)
--- a/src/cam_menu_composer.c
+++ b/src/cam_menu_composer.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_mm.c b/src/cam_mm.c
index 7db795f..5d799ad 100755 (executable)
--- a/src/cam_mm.c
+++ b/src/cam_mm.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_popup.c b/src/cam_popup.c
index 2b07973..17cf9e6 100755 (executable)
--- a/src/cam_popup.c
+++ b/src/cam_popup.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_rec.c b/src/cam_rec.c
index 55d21fb..6a58ecb 100755 (executable)
--- a/src/cam_rec.c
+++ b/src/cam_rec.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_sound.c b/src/cam_sound.c
index 26d4cfa..6cb88c9 100755 (executable)
--- a/src/cam_sound.c
+++ b/src/cam_sound.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_ta.c b/src/cam_ta.c
index 9f89f11..fc6851a 100755 (executable)
--- a/src/cam_ta.c
+++ b/src/cam_ta.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_typeconverter.cpp b/src/cam_typeconverter.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 87db0c7..49102c7
--- a/src/cam_typeconverter.cpp
+++ b/src/cam_typeconverter.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/cam_ui_effect_utils.c b/src/cam_ui_effect_utils.c
index 1136511..f817810 100755 (executable)
--- a/src/cam_ui_effect_utils.c
+++ b/src/cam_ui_effect_utils.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_ui_rotate_utils.c b/src/cam_ui_rotate_utils.c
index 7f11072..d37ea4e 100755 (executable)
--- a/src/cam_ui_rotate_utils.c
+++ b/src/cam_ui_rotate_utils.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/cam_voice_command.c b/src/cam_voice_command.c
old mode 100644 (file)
new mode 100755 (executable)
index 2ba9887..eb8491f
--- a/src/cam_voice_command.c
+++ b/src/cam_voice_command.c
@@ -1,7 +1,7 @@
 /*\r
  * Copyright 2012  Samsung Electronics Co., Ltd\r
  *\r
- * Licensed under the Flora License, Version 1.0 (the "License");\r
+ * Licensed under the Flora License, Version 1.1 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r

diff --git a/src/camera_utils.c b/src/camera_utils.c
index 903baec..6dbc292 100755 (executable)
--- a/src/camera_utils.c
+++ b/src/camera_utils.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_common_edc_callback.c b/src/edc-callback/cam_common_edc_callback.c
index 6e2a33e..07235bd 100755 (executable)
--- a/src/edc-callback/cam_common_edc_callback.c
+++ b/src/edc-callback/cam_common_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_ev_edc_callback.c b/src/edc-callback/cam_ev_edc_callback.c
index 1be8fff..1f76c1e 100755 (executable)
--- a/src/edc-callback/cam_ev_edc_callback.c
+++ b/src/edc-callback/cam_ev_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_indicator_edc_callback.c b/src/edc-callback/cam_indicator_edc_callback.c
index 9525b36..a79b75e 100755 (executable)
--- a/src/edc-callback/cam_indicator_edc_callback.c
+++ b/src/edc-callback/cam_indicator_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_recording_edc_callback.c b/src/edc-callback/cam_recording_edc_callback.c
index 60a7b68..76b92d8 100755 (executable)
--- a/src/edc-callback/cam_recording_edc_callback.c
+++ b/src/edc-callback/cam_recording_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_toolbar_edc_callback.c b/src/edc-callback/cam_toolbar_edc_callback.c
old mode 100644 (file)
new mode 100755 (executable)
index d5c7eb0..94d585d
--- a/src/edc-callback/cam_toolbar_edc_callback.c
+++ b/src/edc-callback/cam_toolbar_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/src/edc-callback/cam_zoom_edc_callback.c b/src/edc-callback/cam_zoom_edc_callback.c
index 1ba9922..410876f 100755 (executable)
--- a/src/edc-callback/cam_zoom_edc_callback.c
+++ b/src/edc-callback/cam_zoom_edc_callback.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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
  *