From: Sooyoung Ha Date: Sat, 13 Apr 2013 11:16:19 +0000 (+0900) Subject: sync with latest master branch X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4cbb6492042312b3484f57e05de34ea1e3a37fe;p=platform%2Fadaptation%2Femulator%2Femulator-plugin-accel-filter.git sync with latest master branch --- diff --git a/AUTHORS b/AUTHORS index 8acdf13..1722483 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,12 @@ -DongKyun Yun -Sungmin Ha +YeongKyoon Lee +DaiYoung Kim +SeokYeon Hwang +SangJin Kim +KiTae Kim +JinHyung Jo +SungMin Ha +MunKyu Im +JiHye Kim +GiWoong Kim +SooYoung Ha HyunGoo Kang diff --git a/COPYING b/LICENSE.LGPLv2.1 similarity index 99% rename from COPYING rename to LICENSE.LGPLv2.1 index fabb204..9c92a19 100644 --- a/COPYING +++ b/LICENSE.LGPLv2.1 @@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/NOTICE b/NOTICE index f085dc6..18b91b4 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1,3 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under GNU LESSER GENERAL PUBLIC LICENSE Version 2.1. +Please, see the LICENSE.LGPLv2.1 file for GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, terms and conditions. diff --git a/debian/copyright b/debian/copyright index ce0fd88..8b13789 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1 @@ -This is $PACKAGE_NAME, written and maintained by $NAME <$EMAIL> -on Fri, 13 Nov 2009 14:08:22 +0900. -The original source can always be found at: - ftp://slp.samsung.net/dists/unstable/main/source/ - -Copyright Holder: $NAME - -License: - samsung - -/* - * Copyright (c) 2008 Samsung Electronics, Inc. - * All rights reserved. - * - * This software is a confidential and proprietary information - * of Samsung Electronics, Inc. ("Confidential Information"). You - * shall not disclose such Confidential Information and shall use - * it only in accordance with the terms of the license agreement - * you entered into with Samsung Electronics. - */ diff --git a/include/accel_sim_filter.h b/include/accel_sim_filter.h index a08056e..ac54798 100644 --- a/include/accel_sim_filter.h +++ b/include/accel_sim_filter.h @@ -3,7 +3,9 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Sungmin Ha + * Contact: + * SooYoung Ha + * Sungmin Ha * * This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the diff --git a/packaging/sf-plugin-filter-accel-emul.spec b/packaging/sf-plugin-filter-accel-emul.spec index 8c537b4..0bb389e 100644 --- a/packaging/sf-plugin-filter-accel-emul.spec +++ b/packaging/sf-plugin-filter-accel-emul.spec @@ -1,6 +1,6 @@ #git:/slp/pkgs/e/emulator-plugin-accel-filter Name: sf-plugin-filter-accel-emul -Version: 0.2.10 +Version: 0.2.11 Release: 1 Summary: Accel simulator filter plugin for sensor framework Group: System Environment/Libraries diff --git a/src/accel_sim_filter.cpp b/src/accel_sim_filter.cpp index f3162c2..c61f146 100644 --- a/src/accel_sim_filter.cpp +++ b/src/accel_sim_filter.cpp @@ -3,7 +3,8 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: + * Contact: + * SooYoung Ha * Sungmin Ha * DongKyun Yun *