Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 14 Apr 2015 10:52:32 +0000 (03:52 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 14 Apr 2015 10:52:32 +0000 (03:52 -0700)
commit9390d7e1f94dfd2011ae6a463f1af6cecb80770a
tree0df22f6b29a568fe08babf04c85e1f4e547eaf56
parent36605faaea4ce6fe307a4421159982b5402ba0da
parent1950b1dcde00fa3c559400aecb5fe83c0a6a13e5
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/actors/image-actor-impl.cpp