Merge remote-tracking branch 'origin/tizen' into new_text 84/36784/1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 11:01:52 +0000 (11:01 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 11:01:52 +0000 (11:01 +0000)
commit3b1fb566901d21b8303d9be3308e3920f5182e6d
tree2efa9d661c7c2849a78e3f6ea1cd6a332bf84e04
parent21c8df56ea5b766c923c9c1d6bb1152c8c640616
parent68522035d7edb98de0dc99512f7f123de3744f4a
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0
packaging/dali-toolkit.spec