Merge remote-tracking branch 'origin/sandbox/jaehwan/devel' into tizen
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 17 Nov 2015 08:47:29 +0000 (17:47 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 17 Nov 2015 08:47:29 +0000 (17:47 +0900)
commit2ab15ff9590809b6ee2323fc973a27d9ecc87557
tree331d072fbf1597aa75d6c7a6a0ebc5bc6723af9c
parent93e6e53785d95b68bf4c8850cb6cd1b5cca53e4c
parentba10906376a38617a513cbcc65e76d452bd7b53b
Merge remote-tracking branch 'origin/sandbox/jaehwan/devel' into tizen

Conflicts:
src/modules/evas/engines/gl_drm/evas_drm.c
src/modules/ecore_imf/wayland/wayland_imcontext.c
src/modules/ecore_imf/wayland/wayland_module.c