review.tizen.org Git - platform/upstream/enlightenment.git/commit

Merge branch 'upstream' into sandbox/shiin/devel

Need to resolve below conflict files.

Conflicts:
configure.ac
src/bin/Makefile.mk
src/bin/e_atoms.c
src/bin/e_atoms.h
src/bin/e_auth.c
src/bin/e_auth.h
src/bin/e_client.c
src/bin/e_client.h
src/bin/e_comp.c
src/bin/e_comp.h
src/bin/e_comp_canvas.c
src/bin/e_comp_object.c
src/bin/e_comp_wl.c
src/bin/e_comp_wl.h
src/bin/e_comp_wl_data.c
src/bin/e_comp_wl_data.h
src/bin/e_comp_wl_input.c
src/bin/e_comp_wl_input.h
src/bin/e_comp_wl_screenshooter_server.c
src/bin/e_comp_x.c
src/bin/e_config.h
src/bin/e_desk.c
src/bin/e_dnd.c
src/bin/e_hints.c
src/bin/e_hints.h
src/bin/e_log.h
src/bin/e_main.c
src/bin/e_module.c
src/bin/e_module.h
src/bin/e_pixmap.c
src/bin/e_pixmap.h
src/bin/e_pointer.c
src/bin/e_scale.c
src/bin/e_scale.h
src/bin/e_signals.c
src/bin/e_win.c
src/bin/e_zone.c
src/bin/e_zone.h
src/modules/Makefile.mk
src/modules/Makefile_music_control.mk
src/modules/Makefile_wl_desktop_shell.mk
src/modules/Makefile_wl_screenshot.mk
src/modules/packagekit/e_mod_packagekit.c
src/modules/shot/screenshooter-client-protocol.h
src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
src/modules/wl_desktop_shell/e_mod_main.c
src/modules/wl_drm/e_mod_main.c
src/modules/wl_screenshot/e_mod_main.c
src/modules/wl_x11/e_mod_main.c

Change-Id: Ia5849a1e958e920aed674b62d8f41af4f85e17e9

author	Seunghun Lee <shiin.lee@samsung.com>
	Mon, 28 Dec 2015 07:21:59 +0000 (16:21 +0900)
committer	Seunghun Lee <shiin.lee@samsung.com>
	Mon, 28 Dec 2015 07:21:59 +0000 (16:21 +0900)
commit	27fa5ecaabe6f6e0564d2aa6dd32c509e492a5d5
tree	8096ce792df82cb270e739970dc4c4df50d24987	tree \| snapshot
parent	d382d2d77fa79bc49eea19c13befbc8ba1bcd3f0	commit \| diff
parent	09954da308036dee619c909876e2708e02a18d8d	commit \| diff

config/default/e.src	diff1 \|	diff2 \|	blob \| history
config/mobile/e.src	diff1 \|	diff2 \|	blob \| history
config/standard/e.src	diff1 \|	diff2 \|	blob \| history
config/tiling/e.src	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/bin/Makefile.mk	diff1 \|	diff2 \|	blob \| history
src/bin/e.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_atoms.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_atoms.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_auth.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_backlight.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_client.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_client.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_canvas.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_cfdata.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_cfdata.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_object.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_object.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl_data.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl_data.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl_input.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_wl_input.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_x.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_comp_x.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_config.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_config.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_desk.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_dnd.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_dpms.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_fm.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_hints.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_hints.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_includes.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_log.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_log.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_main.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_menu.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_module.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_module.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_mouse.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_object.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_object.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_pixmap.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_pixmap.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_pointer.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_scale.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_scale.h	diff1 \|	diff2 \|	blob \| history
src/bin/e_signals.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_startup.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_win.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_zone.c	diff1 \|	diff2 \|	blob \| history
src/bin/e_zone.h	diff1 \|	diff2 \|	blob \| history
src/modules/Makefile.mk	diff1 \|	diff2 \|	blob \| history
src/modules/Makefile_music_control.mk	diff1 \|	diff2 \|	blob \| history
src/modules/Makefile_wl_desktop_shell.mk	diff1 \|	diff2 \|	blob \| history
src/modules/lokker/lokker.c	diff1 \|	diff2 \|	blob \| history
src/modules/packagekit/e_mod_packagekit.c	diff1 \|	diff2 \|	blob \| history
src/modules/teamwork/e_mod_main.c	diff1 \|	diff2 \|	blob \| history
src/modules/wl_desktop_shell/e_mod_main.c	diff1 \|	diff2 \|	blob \| history
src/modules/wl_drm/e_mod_main.c	diff1 \|	diff2 \|	blob \| history
src/modules/wl_x11/e_mod_main.c	diff1 \|	diff2 \|	blob \| history