projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd6df49
436b7cc
)
Merge branch 'devel/master' into tizen
38/108338/1
author
Seoyeon Kim
<seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:05:50 +0000
(15:05 +0900)
committer
Seoyeon Kim
<seoyeon2.kim@samsung.com>
Wed, 4 Jan 2017 06:07:03 +0000
(15:07 +0900)
- Integration 1.2.18 -> 1.2.20 (Version up)
Change-Id: I77f7d666465caa638de6062f1a189a92ac3d5002
1
2
adaptors/ecore/wayland/event-handler-ecore-wl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
adaptors/ecore/wayland/event-handler-ecore-wl.cpp
Simple merge