Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Tue, 14 Apr 2015 10:52:41 +0000 (03:52 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 14 Apr 2015 10:52:41 +0000 (03:52 -0700)
commit935e800159c04fa5d389628add6183eb68f778ee
tree63805a9dffaa531769884c6d2836f1ea87211251
parentb46395d404c2b437c4679975e0ed2c073949ba61
parentfc72d9dfdefd7434202ed73ac579d425279947f3
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/view/view-impl.cpp
dali-toolkit/internal/focus-manager/focus-manager-impl.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
dali-toolkit/public-api/controls/control-impl.cpp