projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 928136d b016174)
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)
Conflicts:
dali-toolkit/internal/controls/text-input/text-input-impl.cpp

Change-Id: Iab734e2329bb8c1380fe115b5924b734ad10c759


Trivial merge
Domain: Graphics System / DALi;