Merge branch 'upstream' into tizen 32/50332/1
authorJaeun Choi <jaeun12.choi@samsung.com>
Tue, 27 Oct 2015 06:52:08 +0000 (15:52 +0900)
committerJaeun Choi <jaeun12.choi@samsung.com>
Tue, 27 Oct 2015 06:52:30 +0000 (15:52 +0900)
commitec04561e3bb22ca8c7a2dcba4034960855cf662c
tree12ff563a248cf3301ce6d11dc99dc8753ded53ec
parentb91f3b65f17e59c4331f19be052056e06aa97a96
parent51278333cbd2fa4a742fece36f8c19526b61210a
Merge branch 'upstream' into tizen

Change-Id: I200d861d3845d2f68edc7ba6d4744268e227762e
autogen.sh
src/base/ftobjs.c
src/pcf/pcfread.c