Merge branch 'tizen_3.0' into tizen 86/123086/1 accepted/tizen/unified/20170406.053614 submit/tizen/20170404.102833
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 4 Apr 2017 10:27:17 +0000 (19:27 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 4 Apr 2017 10:27:33 +0000 (19:27 +0900)
Change-Id: I64180bb60905a630bd4520c1ec084a032c40c219

1  2 
CMakeLists.txt
packaging/ise-default.spec

diff --cc CMakeLists.txt
Simple merge
@@@ -1,6 -1,12 +1,6 @@@
 -%if "%{profile}" == "mobile"
 -%define WITH_CBHM TRUE
 -%else
 -%define WITH_CBHM FALSE
 -%endif
 -
  Name:       ise-default
  Summary:    Tizen keyboard
- Version:    1.3.33
+ Version:    1.3.34
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0