projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d340ec
3429cdb
)
Merge branch 'new_text' into tizen
29/38029/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:02:35 +0000
(17:02 +0100)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Thu, 9 Apr 2015 16:03:28 +0000
(17:03 +0100)
Change-Id: Iff4a8ad638aa654b016d49a1dc07a602618f64be
Trivial merge