Merge branch 'tizen_6.0' into tizen

Change-Id: I7bfbca16150581d0a1205621605ccce3a2f1d419

diff --cc ise-default.xml
index 9b6d312,326035d..8e94df6
--- 1/ise-default.xml
--- 2/ise-default.xml
+++ b/ise-default.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="utf-8"?>
- <manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.8.2" install-location="internal-only" support-mode="ultra-power-saving">
 -<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.7.17" install-location="internal-only" support-mode="ultra-power-saving">
++<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.8.3" install-location="internal-only" support-mode="ultra-power-saving">
  <author/>
  <description/>
  <label>Tizen keyboard</label>

diff --cc packaging/ise-default.spec
index a77c77a,29258a7..8e8413b
--- 1/packaging/ise-default.spec
--- 2/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       ise-default
  Summary:    Tizen keyboard
- Version:    1.8.2
 -Version:    1.7.17
++Version:    1.8.3
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0

diff --cc src/candidate-efl.cpp
Simple merge

diff --cc src/candidate-multiline-efl.cpp
Simple merge

diff --cc src/include/candidate-efl.h
Simple merge

diff --cc src/include/candidate-multiline-efl.h
Simple merge