Merge branch 'tizen_3.0' into tizen 87/114587/1 accepted/tizen/common/20170214.173748 accepted/tizen/ivi/20170215.085640 accepted/tizen/mobile/20170215.085518 accepted/tizen/tv/20170215.085551 accepted/tizen/wearable/20170215.085614 submit/tizen/20170214.062550
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 14 Feb 2017 06:18:40 +0000 (15:18 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 14 Feb 2017 06:18:48 +0000 (15:18 +0900)
commite5df7adc388a3d4d8d141b04e51bc2cbce516ee1
treeb302f4027abba5b2512965f79aff4f2213ec6985
parente7e335e889a6d07e4f54233fa056801e28daf5f2
parentcd632f54c7586c1947d1ea8afb1bc16b4c64fba6
Merge branch 'tizen_3.0' into tizen

Change-Id: I472ed91a64b6c71509f03968cce960235df00163
CMakeLists.txt
packaging/capi-ui-inputmethod.spec
src/inputmethod.cpp