Merge branch 'devel/master' into tizen

author minho.sun <minho.sun@samsung.com>

Wed, 7 Jun 2017 05:44:11 +0000 (14:44 +0900)

committer minho.sun <minho.sun@samsung.com>

Wed, 7 Jun 2017 05:44:24 +0000 (14:44 +0900)
author minho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:44:11 +0000 (14:44 +0900)
committer minho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:44:24 +0000 (14:44 +0900)
diff --cc adaptors/ecore/wayland/event-handler-ecore-wl.cpp
Simple merge
diff --cc build/tizen/adaptor/Makefile.am
Simple merge
diff --cc platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
Simple merge
author	minho.sun <minho.sun@samsung.com>
	Wed, 7 Jun 2017 05:44:11 +0000 (14:44 +0900)
committer	minho.sun <minho.sun@samsung.com>
	Wed, 7 Jun 2017 05:44:24 +0000 (14:44 +0900)
		1	2
adaptors/ecore/wayland/event-handler-ecore-wl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
build/tizen/adaptor/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history