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

packaging/default-fonts-sdk.spec

index cf3cf43..f62c360 100644 (file)
@@ -1,8 +1,8 @@
 #default-fonts-sdk
 Name:       default-fonts-sdk
 Summary:    fonts for Tizen SDK
-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