Merge "Add parent set for mulit window." into devel/master

author Wonsik Jung <sidein@samsung.com>

Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)
author Wonsik Jung <sidein@samsung.com>
Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)
diff --cc dali/devel-api/adaptor-framework/window-devel.cpp
Simple merge
diff --cc dali/devel-api/adaptor-framework/window-devel.h
Simple merge
diff --cc dali/internal/window-system/common/window-impl.h
Simple merge
author	Wonsik Jung <sidein@samsung.com>
	Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 16 Aug 2019 04:09:30 +0000 (04:09 +0000)
		1	2
dali/devel-api/adaptor-framework/window-devel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/devel-api/adaptor-framework/window-devel.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/window-system/common/window-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history