From: Jae Yong Hwang <j_yong.hwang@samsung.com>
Date: Mon, 15 Sep 2014 01:38:44 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.3b
X-Git-Tag: accepted/tizen/ivi/20160218.023428^2~29^2~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fgraphics%2Fdefault-fonts-sdk.git;a=commitdiff_plain;h=3dee2a7c7d9bf7543bed95eecb25de45ddc449ee

Merge branch 'master' into tizen_2.3b

Conflicts:
	packaging/default-fonts-sdk.spec
---

3dee2a7c7d9bf7543bed95eecb25de45ddc449ee
diff --cc packaging/default-fonts-sdk.spec
index fe90b21,cf3cf43..f62c360
--- a/packaging/default-fonts-sdk.spec
+++ b/packaging/default-fonts-sdk.spec
@@@ -1,8 -1,8 +1,8 @@@
  #default-fonts-sdk
  Name:       default-fonts-sdk
  Summary:    fonts for Tizen SDK
- Version:    1.2.2.3
 -Version:    1.2.2.1
 -Release:    23
++Version:    1.2.2.4
 +Release:    21
  Group:      TO_BE/FILLED_IN
  License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz