Merge "Added helper function to retrieve which window a given actor is added to"...

author Adeel Kazmi <adeel.kazmi@samsung.com>

Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)

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

Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)
diff --cc dali/internal/adaptor/common/adaptor-impl.cpp
Simple merge
diff --cc dali/internal/adaptor/common/adaptor-impl.h
Simple merge
diff --cc dali/internal/window-system/common/window-impl.cpp
Simple merge
diff --cc dali/internal/window-system/common/window-impl.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 9 May 2019 16:07:30 +0000 (16:07 +0000)
		1	2
dali/internal/adaptor/common/adaptor-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/adaptor/common/adaptor-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/window-system/common/window-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/window-system/common/window-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history