projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6643fc7
f6dac5b
)
Merge remote-tracking branch 'origin/tizen' into new_text
12/38012/1
author
Paul Wisbey
<p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:23:19 +0000
(13:23 +0100)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:23:40 +0000
(13:23 +0100)
Change-Id: Ica8aad6d34fbebf441eb859fb716935aeaf0105f
1
2
demo/dali-table-view.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/blocks/blocks-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/cluster/cluster-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/magnifier/magnifier-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/refraction-effect/refraction-effect-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
demo/dali-table-view.cpp
Simple merge
diff --cc
examples/blocks/blocks-example.cpp
Simple merge
diff --cc
examples/cluster/cluster-example.cpp
Simple merge
diff --cc
examples/magnifier/magnifier-example.cpp
Simple merge
diff --cc
examples/refraction-effect/refraction-effect-example.cpp
Simple merge
diff --cc
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
Simple merge