projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c46d8cb
3d485e1
)
Merge "Type registry helper: Toolkit change to correct Programming Guide for Custom...
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Fri, 20 May 2016 17:25:17 +0000
(10:25 -0700)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Fri, 20 May 2016 17:25:17 +0000
(10:25 -0700)
1
2
dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
docs/content/programming-guide/properties.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
Simple merge
diff --cc
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
Simple merge
diff --cc
docs/content/programming-guide/properties.h
Simple merge