Merge branch 'devel/master' into tizen 77/178477/1
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 05:17:17 +0000 (14:17 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 10 May 2018 05:17:38 +0000 (14:17 +0900)
commitd82260d6e853c837e430373470ed4a576a2cadc2
treea10eef1a7fc4a8d86fb5425a1888f7b601268695
parent832d39cabfd530f904fd25bf610b4aa879937fd8
parent463b400c0985718b44afe93df81d881703a51423
Merge branch 'devel/master' into tizen

Change-Id: Icd15959a66a4d9921d8606c2095b4243ac8516ea
build/tizen/adaptor/Makefile.am
dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp