projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0678898
5d2e92f
)
Merge branch 'devel/master' into devel/vulkan
author
Francisco Santos
<f1.santos@samsung.com>
Mon, 20 Mar 2017 11:37:18 +0000
(11:37 +0000)
committer
Francisco Santos
<f1.santos@samsung.com>
Mon, 20 Mar 2017 11:37:18 +0000
(11:37 +0000)
1
2
dali/internal/update/manager/update-manager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali/internal/update/manager/update-manager.cpp
Simple merge