From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Sat, 10 Dec 2016 11:55:45 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20161210.162400^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10fd2cdbdbf47666ddb9a459975b8f537973705b;p=platform%2Fcore%2Fuifw%2Fise-default.git

Merge branch 'tizen_3.0' into tizen

Change-Id: Ice9527da25dd4cbb50e82de839ce0785c2f2f720
---

10fd2cdbdbf47666ddb9a459975b8f537973705b
diff --cc packaging/ise-default.spec
index 779d5af,66fc453..91b9970
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@@ -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.13
+ Version:    1.3.14
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0