From: Seoyeon Kim Date: Thu, 28 Sep 2017 11:35:45 +0000 (+0000) Subject: Merge "[Tizen] Add Finalize api for imf-manager" into tizen_4.0 X-Git-Tag: accepted/tizen/4.0/unified/20171010.163017~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=c7ed3e29f4fb0637fc8f6f8c19cad9947132d8df Merge "[Tizen] Add Finalize api for imf-manager" into tizen_4.0 --- c7ed3e29f4fb0637fc8f6f8c19cad9947132d8df diff --cc adaptors/devel-api/adaptor-framework/imf-manager.cpp index 620fdd1,37019d9..8571653 mode 100644,100755..100755 --- a/adaptors/devel-api/adaptor-framework/imf-manager.cpp +++ b/adaptors/devel-api/adaptor-framework/imf-manager.cpp diff --cc adaptors/devel-api/adaptor-framework/imf-manager.h index 2780d9a,064ed0b..0efdeac mode 100644,100755..100755 --- a/adaptors/devel-api/adaptor-framework/imf-manager.h +++ b/adaptors/devel-api/adaptor-framework/imf-manager.h diff --cc adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp index 69e5e41,0ae5603..942d96c mode 100644,100755..100755 --- a/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/imf-manager-impl-ecore-wl.cpp diff --cc adaptors/ecore/wayland/imf-manager-impl.h index e3a73ad,2d1638c..3d2d451 mode 100644,100755..100755 --- a/adaptors/ecore/wayland/imf-manager-impl.h +++ b/adaptors/ecore/wayland/imf-manager-impl.h diff --cc adaptors/integration-api/x11/imf-manager-impl.h index aab3f9f,2ad44b1..f069d42 mode 100644,100755..100755 --- a/adaptors/integration-api/x11/imf-manager-impl.h +++ b/adaptors/integration-api/x11/imf-manager-impl.h diff --cc adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp index ec7cdc7,4ff043e..37a86e4 mode 100644,100755..100755 --- a/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp +++ b/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp diff --cc adaptors/wayland/input/text/imf/imf-manager-impl.h index d0739a8,176e75c..8b4df80 mode 100644,100755..100755 --- a/adaptors/wayland/input/text/imf/imf-manager-impl.h +++ b/adaptors/wayland/input/text/imf/imf-manager-impl.h diff --cc adaptors/x11/imf-manager-impl-x.cpp index 6d9d2a2,a46fa9d..1d9294f mode 100644,100755..100755 --- a/adaptors/x11/imf-manager-impl-x.cpp +++ b/adaptors/x11/imf-manager-impl-x.cpp