Merge branch 'upstream' into tizen
authorBowon Ryu <bowon.ryu@samsung.com>
Tue, 22 Dec 2020 02:08:28 +0000 (11:08 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Tue, 22 Dec 2020 02:08:28 +0000 (11:08 +0900)
1  2 
autogen.sh
src/base/ftobjs.c

diff --cc autogen.sh
Simple merge
Simple merge