Merge "Change RenderTaskList to behave like any other SceneGraph object" into devel...

author David Steele <david.steele@samsung.com>

Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)

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

Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)
author David Steele <david.steele@samsung.com>
Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)
diff --cc dali/internal/event/common/stage-impl.cpp
Simple merge
diff --cc dali/internal/update/manager/update-manager.cpp
Simple merge
diff --cc dali/internal/update/manager/update-manager.h
Simple merge
author	David Steele <david.steele@samsung.com>
	Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 25 Oct 2018 10:20:11 +0000 (10:20 +0000)
		1	2
dali/internal/event/common/stage-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-manager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-manager.h	patch \|	diff1 \|	diff2 \|	blob \| history