projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3c97a2
aecc2d4
)
Merge "Revert "Remove EGL surface in the update thread"" into devel/master
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Wed, 20 May 2020 22:49:19 +0000
(22:49 +0000)
committer
Gerrit Code Review
<gerrit@review>
Wed, 20 May 2020 22:49:19 +0000
(22:49 +0000)
1
2
dali/internal/adaptor/common/adaptor-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/adaptor/common/adaptor-impl.h
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/adaptor/common/combined-update-render-controller.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/window-system/common/window-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali/internal/adaptor/common/adaptor-impl.cpp
Simple merge
diff --cc
dali/internal/adaptor/common/adaptor-impl.h
Simple merge
diff --cc
dali/internal/adaptor/common/combined-update-render-controller.cpp
Simple merge
diff --cc
dali/internal/window-system/common/window-impl.cpp
index
b21ca77
,
a0fd809
..
69ba1d9
mode 100755,100644..100755
---
1
/
dali/internal/window-system/common/window-impl.cpp
---
2
/
dali/internal/window-system/common/window-impl.cpp
+++ b/
dali/internal/window-system/common/window-impl.cpp
projects / platform / core / uifw / dali-adaptor.git / commitdiff