projects / platform / core / graphics / default-fonts-sdk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a90d5a5 b2f97a2)
Merge branch 'master' into tizen_2.3b
authorJae Yong Hwang <j_yong.hwang@samsung.com>
Mon, 15 Sep 2014 01:38:44 +0000 (10:38 +0900)
committerJae Yong Hwang <j_yong.hwang@samsung.com>
Mon, 15 Sep 2014 01:38:44 +0000 (10:38 +0900)
Conflicts:
packaging/default-fonts-sdk.spec

1  2 
packaging/default-fonts-sdk.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/default-fonts-sdk.spec
index fe90b21e9b77768639965ec1cf777251fd37850f,cf3cf431010266d284e8583d928c35906a9c3ca7..f62c36005fd6cb4aac1b9cac682c4e2afcfb524c
--- 1/packaging/default-fonts-sdk.spec
--- 2/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
Domain: UI Framework / Fonts;