Merge "Completely remove use of Adaptor class" into tizen

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

Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)

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

Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)
diff --cc base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 24 Sep 2014 13:45:46 +0000 (06:45 -0700)