diff options
| author | Jae Yong Hwang <j_yong.hwang@samsung.com> | 2014-09-15 10:38:44 +0900 |
|---|---|---|
| committer | Jae Yong Hwang <j_yong.hwang@samsung.com> | 2014-09-15 10:38:44 +0900 |
| commit | 3dee2a7c7d9bf7543bed95eecb25de45ddc449ee (patch) | |
| tree | 6e408e117b4a00d4204d2b6941da24f8ffd9328e | |
| parent | a90d5a5d14c8bd3df670b0fa01f3c9e52aee287c (diff) | |
| parent | b2f97a2895dd69ec7140d7652e46b3962c071bff (diff) | |
| download | default-fonts-sdk-3dee2a7c7d9bf7543bed95eecb25de45ddc449ee.tar.gz default-fonts-sdk-3dee2a7c7d9bf7543bed95eecb25de45ddc449ee.tar.bz2 default-fonts-sdk-3dee2a7c7d9bf7543bed95eecb25de45ddc449ee.zip | |
Merge branch 'master' into tizen_2.3b
Conflicts:
packaging/default-fonts-sdk.spec
| -rw-r--r-- | fallback_fonts/TizenSansKhmerRegular.ttf | bin | 87032 -> 83676 bytes | |||
| -rw-r--r-- | packaging/default-fonts-sdk.spec | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fallback_fonts/TizenSansKhmerRegular.ttf b/fallback_fonts/TizenSansKhmerRegular.ttf Binary files differindex 605e728..3d0a7f4 100644 --- a/fallback_fonts/TizenSansKhmerRegular.ttf +++ b/fallback_fonts/TizenSansKhmerRegular.ttf diff --git a/packaging/default-fonts-sdk.spec b/packaging/default-fonts-sdk.spec index fe90b21..f62c360 100644 --- a/packaging/default-fonts-sdk.spec +++ b/packaging/default-fonts-sdk.spec @@ -1,7 +1,7 @@ #default-fonts-sdk Name: default-fonts-sdk Summary: fonts for Tizen SDK -Version: 1.2.2.3 +Version: 1.2.2.4 Release: 21 Group: TO_BE/FILLED_IN License: Apache-2.0 |