From: Goo Lee Date: Tue, 7 May 2013 15:12:05 +0000 (+0900) Subject: [Request]Update Flora license version X-Git-Tag: 2.2_release~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3904d612146c7d9ae17430461d544f4ce99a83aa;p=apps%2Fhome%2Fug-memo-efl.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 6855804..a44e48b 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/detail.edc b/edc/detail.edc index ddf2cff..23bb8da 100644 --- a/edc/detail.edc +++ b/edc/detail.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 0a8a754..49dcfa9 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/edit_list.edc b/edc/edit_list.edc index bde6cbd..32ea990 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/gl_edit_list.edc b/edc/gl_edit_list.edc index f213da7..9e4ffe0 100644 --- a/edc/gl_edit_list.edc +++ b/edc/gl_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/selector.edc b/edc/selector.edc index 4fe5393..667ac50 100644 --- a/edc/selector.edc +++ b/edc/selector.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 f79d584..0aaef70 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/extend/extended-edc.h b/extend/extended-edc.h index 1dbe9d9..aaee905 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 376900c..910930d 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 0d266c8..4f3645f 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 61c182a..21ff0f8 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-efl.h b/include/memo-efl.h index 7148e02..196f7fb 100644 --- a/include/memo-efl.h +++ b/include/memo-efl.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 ae62d1c..4dc6f10 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_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_string.h b/include/memo_string.h index be897c3..5d939dc 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 2ade706..60ca095 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 7f2f20e..61a3dd8 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/edit.c b/src/edit.c index b6644ba..62ceff8 100644 --- a/src/edit.c +++ b/src/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-assist.c b/src/memo-assist.c index ff25664..94d52f9 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-efl.c b/src/memo-efl.c index 47ab308..0139cd6 100644 --- a/src/memo-efl.c +++ b/src/memo-efl.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 c24bf79..9d538dc 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_autolink.c b/src/memo_autolink.c index 1b610e2..cd58c3f 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_doodle_editor.c b/src/memo_doodle_editor.c index fe093c5..dc5316f 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_text_editor.c b/src/memo_text_editor.c index 68e9b10..650ba28 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_ug.c b/src/memo_ug.c index af8362d..908ddb7 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/src/ug-detail.c b/src/ug-detail.c index 322bdb6..791494b 100644 --- a/src/ug-detail.c +++ b/src/ug-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/ug-select.c b/src/ug-select.c index c3e52f7..9752f17 100644 --- a/src/ug-select.c +++ b/src/ug-select.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 *