Merge branch 'tizen_6.0' into tizen 92/249092/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 7 Dec 2020 05:06:39 +0000 (14:06 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 7 Dec 2020 05:06:39 +0000 (14:06 +0900)
Change-Id: I3b71d0ea386e6113491f2aa1a8e3e0d9ecb1dd34

1  2 
ise-default.xml
packaging/ise-default.spec
src/sdk.cpp

diff --cc 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.1" 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.16" 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.2" install-location="internal-only" support-mode="ultra-power-saving">
  <author/>
  <description/>
  <label>Tizen keyboard</label>
@@@ -1,6 -1,6 +1,6 @@@
  Name:       ise-default
  Summary:    Tizen keyboard
- Version:    1.8.1
 -Version:    1.7.16
++Version:    1.8.2
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0
diff --cc src/sdk.cpp
Simple merge