Merge "Remove unnecessary method from control-impl" into tizen

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

Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)

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

Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)
diff --cc base/dali-toolkit/public-api/controls/control-impl.cpp
Simple merge
diff --cc base/dali-toolkit/public-api/controls/control-impl.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 28 Aug 2014 17:41:54 +0000 (10:41 -0700)
		1	2
base/dali-toolkit/public-api/controls/control-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
base/dali-toolkit/public-api/controls/control-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history