diff options
author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:15:55 +0900 |
---|---|---|
committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:15:55 +0900 |
commit | 298e03bff516995efcbe976281dfacdffaaa09e7 (patch) | |
tree | 17cf215bc9476e0764c9425996a9397f4272d67e | |
parent | fafc3ecde4dc864bd049ca271a757e528ee7894d (diff) | |
download | libmm-session-298e03bff516995efcbe976281dfacdffaaa09e7.tar.gz libmm-session-298e03bff516995efcbe976281dfacdffaaa09e7.tar.bz2 libmm-session-298e03bff516995efcbe976281dfacdffaaa09e7.zip |
merge with master
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | LICENSE (renamed from LICENSE.APLv2) | 2 | ||||
-rw-r--r-- | NOTICE | 3 | ||||
-rw-r--r-- | mm_session.c | 5 | ||||
-rw-r--r-- | mm_session.h | 4 | ||||
-rw-r--r-- | mm_session_private.h | 4 | ||||
-rw-r--r-- | packaging/libmm-session.spec | 7 |
7 files changed, 11 insertions, 16 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 79a79b1..0000000 --- a/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Seungbae Shin <seungbae.shin at samsung.com> -Sangchul Lee <sc11.lee at samsung.com> @@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
Apache License
Version 2.0, January 2004
@@ -1,3 +0,0 @@ -Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Apache License, Version 2. -Please, see the LICENSE file for Apache License terms and conditions. diff --git a/mm_session.c b/mm_session.c index 58c746a..dac8b2f 100644 --- a/mm_session.c +++ b/mm_session.c @@ -1,9 +1,9 @@ /* * libmm-session * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com> + * Contact: Seungbae Shin <seungbae.shin@samsung.com> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ * */ + #include <stdio.h> #include <unistd.h> #include <sys/types.h> diff --git a/mm_session.h b/mm_session.h index 9bad099..7e38301 100644 --- a/mm_session.h +++ b/mm_session.h @@ -1,9 +1,9 @@ /* * libmm-session * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com> + * Contact: Seungbae Shin <seungbae.shin@samsung.com> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/mm_session_private.h b/mm_session_private.h index b4c0a5b..506f451 100644 --- a/mm_session_private.h +++ b/mm_session_private.h @@ -1,9 +1,9 @@ /* * libmm-session * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: Seungbae Shin <seungbae.shin at samsung.com>, Sangchul Lee <sc11.lee at samsung.com> + * Contact: Seungbae Shin <seungbae.shin@samsung.com> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packaging/libmm-session.spec b/packaging/libmm-session.spec index 8e58282..2c15eea 100644 --- a/packaging/libmm-session.spec +++ b/packaging/libmm-session.spec @@ -1,10 +1,9 @@ Name: libmm-session Summary: mm-session development pkg for samsung -Version: 0.2.7 +Version: 0.2.6 Release: 0 -Group: System/Libraries -License: Apache License, Version 2.0 -URL: http://source.tizen.org +Group: TO_BE/FILLED_IN +License: TO BE FILLED IN Source0: libmm-session-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig |