Merge "Remove conditional compilation associated with window manager" into tizen

author Inkyun Kil <inkyun.kil@samsung.com>

Wed, 25 Jan 2017 05:13:40 +0000 (21:13 -0800)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Wed, 25 Jan 2017 05:13:41 +0000 (21:13 -0800)
author Inkyun Kil <inkyun.kil@samsung.com>
Wed, 25 Jan 2017 05:13:40 +0000 (21:13 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 25 Jan 2017 05:13:41 +0000 (21:13 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/appcore-efl.c
Simple merge
author	Inkyun Kil <inkyun.kil@samsung.com>
	Wed, 25 Jan 2017 05:13:40 +0000 (21:13 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 25 Jan 2017 05:13:41 +0000 (21:13 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/appcore-efl.c	patch \|	diff1 \|	diff2 \|	blob \| history