Merge remote-tracking branch 'origin/tizen' into new_text 14/36314/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:26:43 +0000 (19:26 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:27:16 +0000 (19:27 +0000)
commit297b1b9a9b6ed72fe98d5afb018ff4d1c951ce7d
tree81a0bbfb5d2d9decf2f9ea0efaba64f7c9e4e75c
parent928136dbb9e23970f3894eabc7c8b224003b77be
parentb0161740d01e7dab764177a807512faa104149e9
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Iab734e2329bb8c1380fe115b5924b734ad10c759