Merge branch 'devel/master' into tizen 78/168678/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 05:41:33 +0000 (14:41 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 30 Jan 2018 06:33:44 +0000 (15:33 +0900)
commit454e03e2413be60a42ae4bdd2976b0e1d6a20945
tree1ed0622ebc69fdf1404535fa5033ca9e5430417e
parent4e2782714ab3d00267c61661771b971e3f73e038
parent164520a9ed25d8ee8ddba0a1fa97422c238cee73
Merge branch 'devel/master' into tizen

Change-Id: Ie59f37459bc8e17b9ca9ec442d2f6cd45ed68a73
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
build/tizen/adaptor/Makefile.am
dali/internal/window-system/tizen-wayland/event-handler-ecore-wl.cpp