Merge branch 'tizen_2.1_smack' into tizen_2.1

diff --git a/LICENSE b/LICENSE
index a2ae71e..249b868 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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 2013  Samsung Electronics Co., Ltd
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index ded3804..6e010c0 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1 +1,3 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
\ No newline at end of file
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.\r
+Except as noted, this software is licensed under Flora License, Version 1.1.\r
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.\r

diff --git a/include/db-helper.h b/include/db-helper.h
index 06327c0..210a5bb 100644 (file)
--- a/include/db-helper.h
+++ b/include/db-helper.h
@@ -2,7 +2,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/db-schema.h b/include/db-schema.h
index be8b5e5..bb09112 100644 (file)
--- a/include/db-schema.h
+++ b/include/db-schema.h
@@ -2,7 +2,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/db.h b/include/db.h
index b5f3bd8..402af7a 100644 (file)
--- a/include/db.h
+++ b/include/db.h
@@ -2,7 +2,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/memo-db.h b/include/memo-db.h
index 6941673..6ce7280 100644 (file)
--- a/include/memo-db.h
+++ b/include/memo-db.h
@@ -2,7 +2,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/memo-log.h b/include/memo-log.h
index 8c843f6..68aef19 100644 (file)
--- a/include/memo-log.h
+++ b/include/memo-log.h
@@ -2,7 +2,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/db-helper.c b/src/db-helper.c
index bca2d20..ce2b70b 100644 (file)
--- a/src/db-helper.c
+++ b/src/db-helper.c
@@ -2,7 +2,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/db.c b/src/db.c
index 4e32c0d..99bba63 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -2,7 +2,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/memo_dbif.c b/src/memo_dbif.c
index 11f7ad6..db3429b 100644 (file)
--- a/src/memo_dbif.c
+++ b/src/memo_dbif.c
@@ -2,7 +2,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
 *