projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cb64d70
9dd8351
)
Merge remote-tracking branch 'origin/tizen' into new_text
50/35150/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Mon, 9 Feb 2015 18:29:37 +0000
(18:29 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Mon, 9 Feb 2015 18:30:01 +0000
(18:30 +0000)
Change-Id: I18093fe9a0e8e429074f36e5fff26de207940c3f
1
2
demo/dali-table-view.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/buttons/buttons-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/logging/logging-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
demo/dali-table-view.cpp
Simple merge
diff --cc
examples/buttons/buttons-example.cpp
Simple merge
diff --cc
examples/logging/logging-example.cpp
Simple merge
projects / platform / core / uifw / dali-demo.git / commitdiff