flora license update

Change-Id: I27012a9c7716e1b689bc920e8e9b4602aa8e8c94

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
new file mode 100644 (file)
index 0000000..94d56df
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+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/AppResourceId.h b/inc/AppResourceId.h
index 89af834..790b8be 100644 (file)
--- a/inc/AppResourceId.h
+++ b/inc/AppResourceId.h
@@ -1,3 +1,24 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// 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
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// 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.
+//
+
+/**
+ * @file               AppResourceId.h
+ * @brief              This is the declaration file for Types class.
+ */
+
 #ifndef _APP_RESOURCE_ID_H_
 #define _APP_RESOURCE_ID_H_
 

diff --git a/inc/IstDetailForm.h b/inc/IstDetailForm.h
index 01e9a28..f175aed 100644 (file)
--- a/inc/IstDetailForm.h
+++ b/inc/IstDetailForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/IstFormFactory.h b/inc/IstFormFactory.h
index 63ad14d..c9793f2 100644 (file)
--- a/inc/IstFormFactory.h
+++ b/inc/IstFormFactory.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/IstInstallEventListener.h b/inc/IstInstallEventListener.h
index e73f01f..d18d89b 100644 (file)
--- a/inc/IstInstallEventListener.h
+++ b/inc/IstInstallEventListener.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/IstInstallForm.h b/inc/IstInstallForm.h
index 77190d3..f7b8183 100644 (file)
--- a/inc/IstInstallForm.h
+++ b/inc/IstInstallForm.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/IstInstallerApp.h b/inc/IstInstallerApp.h
index 4f26223..acfe3af 100644 (file)
--- a/inc/IstInstallerApp.h
+++ b/inc/IstInstallerApp.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/inc/IstMainFrame.h b/inc/IstMainFrame.h
index de3fbf2..d28f6c0 100644 (file)
--- a/inc/IstMainFrame.h
+++ b/inc/IstMainFrame.h
@@ -1,3 +1,24 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// 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
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// 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.
+//
+
+/**
+ * @file: IstMainFrame.h
+ * @brief: This file contains declaration of IstMainFrame class, which is the main frame of the application.
+ */
+
 #ifndef _IST_MAIN_FRAME_H_
 #define _IST_MAIN_FRAME_H_
 

diff --git a/inc/IstPanelFactory.h b/inc/IstPanelFactory.h
index b992ee2..a3649ae 100644 (file)
--- a/inc/IstPanelFactory.h
+++ b/inc/IstPanelFactory.h
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/AppResourceId.cpp b/src/AppResourceId.cpp
index f2fa381..a6b8d60 100644 (file)
--- a/src/AppResourceId.cpp
+++ b/src/AppResourceId.cpp
@@ -1,3 +1,24 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// 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
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// 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.
+//
+
+/**
+ * @file               AppResourceId.cpp
+ * @brief              This is the implementation file for Types class.
+ */
+
 #include "AppResourceId.h"
 
 const wchar_t* IDF_FORM = L"IDF_FORM";

diff --git a/src/InstallerEntry.cpp b/src/InstallerEntry.cpp
index da96449..570c118 100644 (file)
--- a/src/InstallerEntry.cpp
+++ b/src/InstallerEntry.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstDetailForm.cpp b/src/IstDetailForm.cpp
index 43c8045..87b10a3 100644 (file)
--- a/src/IstDetailForm.cpp
+++ b/src/IstDetailForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstFormFactory.cpp b/src/IstFormFactory.cpp
index b784b78..1347cc1 100644 (file)
--- a/src/IstFormFactory.cpp
+++ b/src/IstFormFactory.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstInstallEventListener.cpp b/src/IstInstallEventListener.cpp
index ce3c286..3a78384 100644 (file)
--- a/src/IstInstallEventListener.cpp
+++ b/src/IstInstallEventListener.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstInstallForm.cpp b/src/IstInstallForm.cpp
index 694c076..8dc38b2 100644 (file)
--- a/src/IstInstallForm.cpp
+++ b/src/IstInstallForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstInstallerApp.cpp b/src/IstInstallerApp.cpp
index 37aba4f..fe7d591 100644 (file)
--- a/src/IstInstallerApp.cpp
+++ b/src/IstInstallerApp.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //

diff --git a/src/IstMainFrame.cpp b/src/IstMainFrame.cpp
index cbca603..127a814 100644 (file)
--- a/src/IstMainFrame.cpp
+++ b/src/IstMainFrame.cpp
@@ -1,3 +1,24 @@
+//
+// Copyright (c) 2012 Samsung Electronics Co., Ltd.
+//
+// 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
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// 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.
+//
+
+/**
+ * @file: IstMainFrame.cpp
+ * @brief: This file contains implementation of IstMainFrame class, which is the main frame of the application.
+ */
+
 #include "IstMainFrame.h"
 #include "IstFormFactory.h"
 #include "IstPanelFactory.h"

diff --git a/src/IstPanelFactory.cpp b/src/IstPanelFactory.cpp
index 2e11039..d690979 100644 (file)
--- a/src/IstPanelFactory.cpp
+++ b/src/IstPanelFactory.cpp
@@ -1,7 +1,7 @@
 //
 // 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
 //