From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Fri, 30 Dec 2016 00:56:54 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20161230.010023^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19b5d0d533f802c2177bb46494160bf998a80632;p=platform%2Fcore%2Fuifw%2Flibscl-core.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I12dc325fee85f8a2aaa5c2daa0ee6952df2a49a6
---

19b5d0d533f802c2177bb46494160bf998a80632
diff --cc packaging/libscl-core.spec
index 7df284b,f0f05d2..59d0cc3
--- 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.32
+ Version:    0.4.33
  Release:    1
  Group:      Graphics & UI Framework/Input
  License:    Apache-2.0