projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21c8df5 6852203)
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)
Conflicts:
dali-toolkit/public-api/controls/text-input/text-input.h
dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0

1  2 
packaging/dali-toolkit.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/dali-toolkit.spec
Simple merge
Domain: Graphics System / DALi;