Merge branch 'devel/master' into tizen 35/125435/1
authorJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 02:29:02 +0000 (11:29 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 08:04:30 +0000 (17:04 +0900)
Change-Id: I48437acbcea44f7a7964c99751ba503dd6a43bc9

1  2 
adaptors/ecore/wayland/event-handler-ecore-wl.cpp
build/tizen/adaptor/Makefile.am

Simple merge