summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaehyub <taehyub.kim@samsung.com>2014-12-15 11:42:00 (GMT)
committertaehyub <taehyub.kim@samsung.com>2014-12-15 13:54:04 (GMT)
commit31279ffa9d2849fc0fcc988b8c25d46d3688963a (patch)
treebb94b0624013267be5134e748ae1ec4f6d1c7761
parentb4d8a82646cce7a157765a42f08ce3a7ef404221 (diff)
parent410abb5b97528c24f8c7d506e304a6c1592f89cd (diff)
downloaddefault-fonts-fc-sdk-31279ffa9d2849fc0fcc988b8c25d46d3688963a.zip
default-fonts-fc-sdk-31279ffa9d2849fc0fcc988b8c25d46d3688963a.tar.gz
default-fonts-fc-sdk-31279ffa9d2849fc0fcc988b8c25d46d3688963a.tar.bz2
[Merge] merge tizen_2.3b to tizen_2.3
Change-Id: Iaffe8fa6e359992cc30015943533e3f91e8a61af
-rwxr-xr-xLICENSE2
-rw-r--r--copyright2
-rw-r--r--packaging/default-fonts-fc-sdk.spec2
-rwxr-xr-xsdk_fonts_fc/99-slp.conf2
4 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index bbe9d02..f0fd1f1 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
Apache License
Version 2.0, January 2004
diff --git a/copyright b/copyright
index 0de89cf..377d507 100644
--- a/copyright
+++ b/copyright
@@ -1,7 +1,7 @@
/*
* default-fonts-fc-sdk
*
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
*
* Contact: Minsu Han <minsu81.han@samsung.com>
*
diff --git a/packaging/default-fonts-fc-sdk.spec b/packaging/default-fonts-fc-sdk.spec
index 4f1e738..089ee67 100644
--- a/packaging/default-fonts-fc-sdk.spec
+++ b/packaging/default-fonts-fc-sdk.spec
@@ -4,7 +4,7 @@ Summary: Font configuration package for SDK
Version: 0.0.4
Release: 1
Group: TO_BE/FILLED_IN
-License: TO BE FILLED IN
+License: Apache License, Version 2.0
Source0: %{name}-%{version}.tar.gz
Source1001: packaging/default-fonts-fc-sdk.manifest
Requires: smack-utils
diff --git a/sdk_fonts_fc/99-slp.conf b/sdk_fonts_fc/99-slp.conf
index 3c66480..2c17d4b 100755
--- a/sdk_fonts_fc/99-slp.conf
+++ b/sdk_fonts_fc/99-slp.conf
@@ -4,7 +4,7 @@
<!--
default-fonts-fc-sdk
- Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
Contact: Minsu Han <minsu81.han@samsung.com>