Merge branch 'devel/x11' into tizen accepted/tizen_3.0.2014.q3_common accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_unified accepted/tizen_wearable tizen tizen_3.0 tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0.m2 accepted/tizen/3.0/common/20161114.110544 accepted/tizen/3.0/ivi/20161011.044043 accepted/tizen/ivi/20160218.024744 accepted/tizen/unified/20170309.035455 submit/tizen/20140818.084211 submit/tizen/20140818.144456 submit/tizen/20140819.234625 submit/tizen_3.0.m2/20170104.093752 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000002 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000005 submit/tizen_mobile/20141120.000000 submit/tizen_unified/20170308.100412 tizen_3.0.2014.q3_common_release tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorBoram Park <boram1288.park@samsung.com>
Wed, 30 Jul 2014 09:11:29 +0000 (18:11 +0900)
committerBoram Park <boram1288.park@samsung.com>
Wed, 30 Jul 2014 09:14:03 +0000 (18:14 +0900)
Change-Id: Ia0352afb8d24323fca5f9c4ead12c905ce9ba9e7

1  2 
packaging/fontsproto.spec

Simple merge