From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Fri, 20 Jan 2017 05:09:29 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170120.061224^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faea8ea3ade895ab8b6dc1362276fddb2fe19608;p=platform%2Fcore%2Fuifw%2Flibscl-core.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I6c30b7674168d48fd2547604774fd96e01df00f7
---

faea8ea3ade895ab8b6dc1362276fddb2fe19608
diff --cc packaging/libscl-core.spec
index e206072,e23b249..cb4c810
--- a/packaging/libscl-core.spec
+++ b/packaging/libscl-core.spec
@@@ -1,9 -1,15 +1,9 @@@
  %bcond_with x
  %bcond_with wayland
  
 -%if "%{?profile}" == "wearable"
 -%define WITH_WEBSOCKET TRUE
 -%else
 -%define WITH_WEBSOCKET FALSE
 -%endif
 -
  Name:       libscl-core
  Summary:    A library for developing software keyboards
- Version:    0.4.35
+ Version:    0.4.36
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0