From: Seokpil Park Date: Mon, 29 Apr 2013 07:24:42 +0000 (+0900) Subject: [BasicApp] Change Flora license version X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcd2875b0ac2ff0701034b6d23b2fdda1c365573;p=apps%2Fnative%2Fsample%2FBasicApp.git [BasicApp] Change Flora license version Change-Id: Ic940d599bf2f192aa7d2cb19f4d45038ace01430 Signed-off-by: Seokpil Park --- diff --git a/LICENSE.Flora b/LICENSE.Flora index 7923a74..571fe79 100644 --- 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 @@ -203,3 +203,4 @@ identification within third-party archives. 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. + diff --git a/NOTICE b/NOTICE index 3997999..94d56df 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,3 @@ -Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE file for Flora License terms and conditions. - +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/project/inc/AppResourceId.h b/project/inc/AppResourceId.h index 7079ae2..e83b9f7 100644 --- a/project/inc/AppResourceId.h +++ b/project/inc/AppResourceId.h @@ -1,3 +1,20 @@ +// +// Tizen C++ SDK +// 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. +// + #ifndef _APP_RESOURCE_ID_H_ #define _APP_RESOURCE_ID_H_ @@ -5,4 +22,5 @@ extern const wchar_t* IDF_MAINFORM; extern const wchar_t* IDC_ORIENTATIONPANEL; extern const wchar_t* IDC_BUTTON_ORIENTATION; extern const wchar_t* IDS_ORIENTATION; + #endif // _APP_RESOURCE_ID_H_ diff --git a/project/inc/BasicApp.h b/project/inc/BasicApp.h index 56295ab..639cfdb 100644 --- a/project/inc/BasicApp.h +++ b/project/inc/BasicApp.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/inc/BasicAppFrame.h b/project/inc/BasicAppFrame.h index 2356edf..55fcaa4 100644 --- a/project/inc/BasicAppFrame.h +++ b/project/inc/BasicAppFrame.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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 // @@ -37,4 +37,4 @@ private: int __panelId; }; -#endif //_BASIC_APP_FRAME_H_ \ No newline at end of file +#endif //_BASIC_APP_FRAME_H_ diff --git a/project/inc/ButtonPanel.h b/project/inc/ButtonPanel.h index a97852b..3b36b71 100644 --- a/project/inc/ButtonPanel.h +++ b/project/inc/ButtonPanel.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/inc/ImagePanel.h b/project/inc/ImagePanel.h index 74f2fa4..5766199 100644 --- a/project/inc/ImagePanel.h +++ b/project/inc/ImagePanel.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/inc/MainForm.h b/project/inc/MainForm.h index 31d7445..c008265 100644 --- a/project/inc/MainForm.h +++ b/project/inc/MainForm.h @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/src/AppResourceId.cpp b/project/src/AppResourceId.cpp index 5225a46..a1f71b3 100644 --- a/project/src/AppResourceId.cpp +++ b/project/src/AppResourceId.cpp @@ -1,3 +1,20 @@ +// +// Tizen C++ SDK +// 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. +// + #include "AppResourceId.h" const wchar_t* IDF_MAINFORM = L"IDF_MAINFORM"; diff --git a/project/src/BasicApp.cpp b/project/src/BasicApp.cpp index 9269e88..686a91f 100644 --- a/project/src/BasicApp.cpp +++ b/project/src/BasicApp.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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 // @@ -104,4 +104,4 @@ BasicApp::OnScreenOn (void) void BasicApp::OnScreenOff (void) { -} \ No newline at end of file +} diff --git a/project/src/BasicAppEntry.cpp b/project/src/BasicAppEntry.cpp index 5e3737a..ad58440 100644 --- a/project/src/BasicAppEntry.cpp +++ b/project/src/BasicAppEntry.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/src/BasicAppFrame.cpp b/project/src/BasicAppFrame.cpp index 4ec1897..d8f946a 100644 --- a/project/src/BasicAppFrame.cpp +++ b/project/src/BasicAppFrame.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/src/ButtonPanel.cpp b/project/src/ButtonPanel.cpp index 064e3d6..dd482fe 100644 --- a/project/src/ButtonPanel.cpp +++ b/project/src/ButtonPanel.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/src/ImagePanel.cpp b/project/src/ImagePanel.cpp index 1e669b6..a8a79e3 100644 --- a/project/src/ImagePanel.cpp +++ b/project/src/ImagePanel.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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/project/src/MainForm.cpp b/project/src/MainForm.cpp index 5a898cb..f0749f2 100644 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.cpp @@ -2,7 +2,7 @@ // Tizen C++ SDK // 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 //