Merge branch 'tizen_3.0' into tizen

author Jihoon Kim <jihoon48.kim@samsung.com>

Sat, 10 Dec 2016 11:55:45 +0000 (20:55 +0900)

committer Jihoon Kim <jihoon48.kim@samsung.com>

Sat, 10 Dec 2016 11:55:50 +0000 (20:55 +0900)
author Jihoon Kim <jihoon48.kim@samsung.com>
Sat, 10 Dec 2016 11:55:45 +0000 (20:55 +0900)
committer Jihoon Kim <jihoon48.kim@samsung.com>
Sat, 10 Dec 2016 11:55:50 +0000 (20:55 +0900)
diff --cc packaging/ise-default.spec

index 779d5af,66fc453..91b9970
--- 1/packaging/ise-default.spec
--- 2/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
author	Jihoon Kim <jihoon48.kim@samsung.com>
	Sat, 10 Dec 2016 11:55:45 +0000 (20:55 +0900)
committer	Jihoon Kim <jihoon48.kim@samsung.com>
	Sat, 10 Dec 2016 11:55:50 +0000 (20:55 +0900)