Merge "Changes for std::vector removal from api" into tizen

author Kimmo Hoikka <kimmo.hoikka@samsung.com>

Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)

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

Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
Simple merge
diff --cc dali-toolkit/public-api/controls/control-impl.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Fri, 29 May 2015 17:38:53 +0000 (10:38 -0700)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history