projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
36605fa
1950b1d
)
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
author
Kimmo Hoikka
<kimmo.hoikka@samsung.com>
Tue, 14 Apr 2015 10:52:32 +0000
(
03:52
-0700)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Tue, 14 Apr 2015 10:52:32 +0000
(
03:52
-0700)
1
2
dali/internal/event/actors/actor-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali/internal/event/actors/image-actor-impl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali/internal/event/actors/actor-impl.cpp
Simple merge
diff --cc
dali/internal/event/actors/image-actor-impl.cpp
Simple merge