Merge branch 'devel/master' into tizen 30/132630/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:44:11 +0000 (14:44 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:44:24 +0000 (14:44 +0900)
commitc8250e2ee705059fed16528ca49642da093d6648
treed26ad17ff88700d5cca804c4b3550f13732ea8a9
parentf3f902c8d9bc7a28a4f909dac3470daa393175a8
parent76c462a74205707283c580741c7342046f5dc73b
Merge branch 'devel/master' into tizen

Change-Id: I70d40822eedf3c3809b3fcaf67eca25fbb04fbc8
adaptors/ecore/wayland/event-handler-ecore-wl.cpp
build/tizen/adaptor/Makefile.am
platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp