From a97a6adb848585dde5a09c31c40ba9687792b27e Mon Sep 17 00:00:00 2001 From: Jisung Ahn Date: Wed, 1 May 2013 17:17:36 +0900 Subject: [PATCH] update license Change-Id: Iddd3bb2a8edc36a782ba47f2c799d18f4dcc20c9 --- LICENSE.Flora | 26 +++++++++++++------------- NOTICE | 4 ++-- include/face-engine.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) mode change 100644 => 100755 NOTICE diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100755 --- 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 old mode 100644 new mode 100755 index aee20a0..000ae42 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1 including following +Except as noted, this software is licensed under Flora License, Version 1.1 including following software modules @@ -9,6 +9,6 @@ software modules - engine/arm/libface-engine.so - engine/i586/libface-engine.so -Please, see the LICENSE.Flora file for Flora License, Version 1 terms and conditions. +Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/include/face-engine.h b/include/face-engine.h index 9c9330f..e8e2306 100755 --- a/include/face-engine.h +++ b/include/face-engine.h @@ -1,7 +1,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 * -- 2.7.4