From: Goo Lee Date: Tue, 7 May 2013 15:11:28 +0000 (+0900) Subject: [Request]Update Flora license version X-Git-Tag: submit/tizen_2.1/20130514.053805~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75d0d68559989b218bbd505d2fd2077ebdb1960c;p=apps%2Fhome%2Fmemo.git [Request]Update Flora license version --- diff --git a/LICENSE b/LICENSE index a2ae71e..249b868 100644 --- 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 --- 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. +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/common.edc b/edc/common.edc index fbe08f4..f872484 100644 --- a/edc/common.edc +++ b/edc/common.edc @@ -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/edc/doodle_editor.edc b/edc/doodle_editor.edc index 614dc15..b4cc0ce 100644 --- a/edc/doodle_editor.edc +++ b/edc/doodle_editor.edc @@ -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/edc/doodle_viewer.edc b/edc/doodle_viewer.edc index a9851fb..a867fa2 100644 --- a/edc/doodle_viewer.edc +++ b/edc/doodle_viewer.edc @@ -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/edc/edit_list.edc b/edc/edit_list.edc index b6ed376..1390634 100644 --- a/edc/edit_list.edc +++ b/edc/edit_list.edc @@ -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/edc/edit_tool.edc b/edc/edit_tool.edc index 4430ece..21104b6 100644 --- a/edc/edit_tool.edc +++ b/edc/edit_tool.edc @@ -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/edc/list.edc b/edc/list.edc index 3d9ec8b..1b81c94 100644 --- a/edc/list.edc +++ b/edc/list.edc @@ -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/edc/text_editor.edc b/edc/text_editor.edc index fc14e0f..fad88d5 100644 --- a/edc/text_editor.edc +++ b/edc/text_editor.edc @@ -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/edc/text_viewer.edc b/edc/text_viewer.edc index 8c6df94..364c6c0 100644 --- a/edc/text_viewer.edc +++ b/edc/text_viewer.edc @@ -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/extend/extended-edc.h b/extend/extended-edc.h index 088dea5..cb536be 100644 --- a/extend/extended-edc.h +++ b/extend/extended-edc.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/extend/extended-elm.c b/extend/extended-elm.c index e03c44c..44d3f09 100644 --- a/extend/extended-elm.c +++ b/extend/extended-elm.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/extend/extended-elm.h b/extend/extended-elm.h index 4e007c0..5ffd9ac 100644 --- a/extend/extended-elm.h +++ b/extend/extended-elm.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/extend/gravel.h b/extend/gravel.h index 2861045..29fb58a 100644 --- a/extend/gravel.h +++ b/extend/gravel.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/extend/supplement.c b/extend/supplement.c index f0e15e1..f6f8d81 100644 --- a/extend/supplement.c +++ b/extend/supplement.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/extend/supplement.h b/extend/supplement.h index e165e58..4707249 100644 --- a/extend/supplement.h +++ b/extend/supplement.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-assist.h b/include/memo-assist.h index 121fcaa..bc27be4 100644 --- a/include/memo-assist.h +++ b/include/memo-assist.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-genlist.h b/include/memo-genlist.h index 39717ff..4d5b9d4 100644 --- a/include/memo-genlist.h +++ b/include/memo-genlist.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.h b/include/memo.h index 22834be..7bff87a 100644 --- a/include/memo.h +++ b/include/memo.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_autolink.h b/include/memo_autolink.h index 385597e..a879237 100644 --- a/include/memo_autolink.h +++ b/include/memo_autolink.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_doodle_editor.h b/include/memo_doodle_editor.h index 89b48d7..0f8a3f2 100644 --- a/include/memo_doodle_editor.h +++ b/include/memo_doodle_editor.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 b0b9631..8216c93 100644 --- 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/include/memo_string.h b/include/memo_string.h index fc3cf50..22f839c 100644 --- a/include/memo_string.h +++ b/include/memo_string.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_text_editor.h b/include/memo_text_editor.h index e1909b4..34effc0 100644 --- a/include/memo_text_editor.h +++ b/include/memo_text_editor.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_ug.h b/include/memo_ug.h index 5879def..e230987 100644 --- a/include/memo_ug.h +++ b/include/memo_ug.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/memo.edc b/memo.edc index 033bc8e..ebdef54 100644 --- a/memo.edc +++ b/memo.edc @@ -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/scripts/copyright b/scripts/copyright index f317db9..dd461b5 100644 --- a/scripts/copyright +++ b/scripts/copyright @@ -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-assist.c b/src/memo-assist.c index a8a1813..4d83c66 100644 --- a/src/memo-assist.c +++ b/src/memo-assist.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-genlist.c b/src/memo-genlist.c index 11f5a8a..5deb351 100644 --- a/src/memo-genlist.c +++ b/src/memo-genlist.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.c b/src/memo.c index 3007b45..1db5d75 100644 --- a/src/memo.c +++ b/src/memo.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_autolink.c b/src/memo_autolink.c index 93b7452..f230e9d 100644 --- a/src/memo_autolink.c +++ b/src/memo_autolink.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_detail.c b/src/memo_detail.c index 3bf76d6..0a5bcb6 100644 --- a/src/memo_detail.c +++ b/src/memo_detail.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_doodle_editor.c b/src/memo_doodle_editor.c index e8855ef..547ce34 100644 --- a/src/memo_doodle_editor.c +++ b/src/memo_doodle_editor.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_doodle_viewer.c b/src/memo_doodle_viewer.c index f301f49..f02ff0b 100644 --- a/src/memo_doodle_viewer.c +++ b/src/memo_doodle_viewer.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_edit.c b/src/memo_edit.c index da5eddd..1d13f9a 100644 --- a/src/memo_edit.c +++ b/src/memo_edit.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_edit_list.c b/src/memo_edit_list.c index 7163159..a4c97d3 100644 --- a/src/memo_edit_list.c +++ b/src/memo_edit_list.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_list.c b/src/memo_list.c index 5018916..77ea6aa 100644 --- a/src/memo_list.c +++ b/src/memo_list.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_list_editor.c b/src/memo_list_editor.c index 6731c9e..3450aa6 100644 --- a/src/memo_list_editor.c +++ b/src/memo_list_editor.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_list_viewer.c b/src/memo_list_viewer.c index 202e9a7..d8d681b 100644 --- a/src/memo_list_viewer.c +++ b/src/memo_list_viewer.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_text_editor.c b/src/memo_text_editor.c index 52f0a71..7f1ff6e 100644 --- a/src/memo_text_editor.c +++ b/src/memo_text_editor.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_text_viewer.c b/src/memo_text_viewer.c index 3564a3a..2f9a457 100644 --- a/src/memo_text_viewer.c +++ b/src/memo_text_viewer.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_ug.c b/src/memo_ug.c index 6c4ed47..abd1939 100644 --- a/src/memo_ug.c +++ b/src/memo_ug.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/theme/black/memo.edc b/theme/black/memo.edc index ed0442d..44a03bb 100644 --- a/theme/black/memo.edc +++ b/theme/black/memo.edc @@ -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/theme/common.edc b/theme/common.edc index 8d5c456..c1f4513 100644 --- a/theme/common.edc +++ b/theme/common.edc @@ -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/theme/white/memo.edc b/theme/white/memo.edc index ed0442d..44a03bb 100644 --- a/theme/white/memo.edc +++ b/theme/white/memo.edc @@ -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 *