Merge branch 'tizen_3.0' into tizen 50/115350/1 accepted/tizen/common/20170217.161637 accepted/tizen/ivi/20170220.223149 accepted/tizen/mobile/20170220.223054 accepted/tizen/tv/20170220.223119 accepted/tizen/wearable/20170220.223138 submit/tizen/20170217.113316
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Feb 2017 11:12:00 +0000 (20:12 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 17 Feb 2017 11:12:06 +0000 (20:12 +0900)
Change-Id: I1723a383dcc387daed821dd53f0a51181deb7cf0

1  2 
packaging/e-mod-tizen-wl-textinput.spec
src/e_mod_main.c

Simple merge