projects / platform / core / api / inputmethod.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7e335e cd632f5)
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)
Change-Id: I472ed91a64b6c71509f03968cce960235df00163

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
packaging/capi-ui-inputmethod.spec patch | diff1 | diff2 | blob | history
src/inputmethod.cpp patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc packaging/capi-ui-inputmethod.spec
Simple merge
diff --cc src/inputmethod.cpp
Simple merge
Domain: UI Framework / Text Input;