Merge branch 'tizen_3.0' into tizen 60/107060/2 accepted/tizen/common/20161229.135941 accepted/tizen/ivi/20161229.113040 accepted/tizen/mobile/20161229.112941 accepted/tizen/tv/20161229.112957 accepted/tizen/wearable/20161229.113012 submit/tizen/20161228.222653
authorInHong Han <inhong1.han@samsung.com>
Mon, 26 Dec 2016 09:29:57 +0000 (18:29 +0900)
committerInHong Han <inhong1.han@samsung.com>
Mon, 26 Dec 2016 10:12:32 +0000 (19:12 +0900)
commit3e8fd6aa77a162e31051c0074ef718de6128543e
treed7da520f9052e920a10a512194d92c22e0e4e1b0
parent0e93f77d2f2c5b9c47d17dc2d26238864260b4fc
parentfe2cbcf4571729de5625bfc6578d278564b95007
Merge branch 'tizen_3.0' into tizen

Change-Id: Id5a67fcffecbed83a3c4101e924a8ac0ec72b115
packaging/e-mod-tizen-wl-textinput.spec
src/e_mod_input_panel.c
src/e_mod_main.c
src/e_mod_main.h