Merge branch 'tizen_6.0' into tizen 30/249130/1 accepted/tizen/unified/20201208.123152 submit/tizen/20201207.053045
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 7 Dec 2020 10:24:21 +0000 (19:24 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 7 Dec 2020 10:24:21 +0000 (19:24 +0900)
commit922e3633f04301744b515530580c2f6f2dc6eaac
tree39b32e1337324c93b77e736e600574ed1f2e48ad
parent6c40a3360714191ffb8177c8fdf83f381ad6c859
parent623987cac49ef51143b6e8cf0003bbca8252606c
Merge branch 'tizen_6.0' into tizen

Change-Id: I7bfbca16150581d0a1205621605ccce3a2f1d419
ise-default.xml
packaging/ise-default.spec
src/candidate-efl.cpp
src/candidate-multiline-efl.cpp
src/include/candidate-efl.h
src/include/candidate-multiline-efl.h