Merge branch 'devel/master' into tizen 38/108338/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:05:50 +0000 (15:05 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:07:03 +0000 (15:07 +0900)
commit2a1cff622b9d9f1fce76a9cba61e18415a34b216
tree0856a3a3ba182bf39963235fa6209bcc02cd9327
parentcd6df4910f154731f494be9c74af4c767771fd88
parent436b7cc4d359d29e721fc0bc9f6ee40fab831843
Merge branch 'devel/master' into tizen

- Integration 1.2.18 -> 1.2.20 (Version up)

Change-Id: I77f7d666465caa638de6062f1a189a92ac3d5002
adaptors/ecore/wayland/event-handler-ecore-wl.cpp