Merge "Legacy Size negotiation mapper" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 16 Oct 2018 13:32:06 +0000 (13:32 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 16 Oct 2018 13:32:06 +0000 (13:32 +0000)
commit7742c07e1fdc5d78bab7c2c9cc5d7803f04fb012
treea93efc344ba603d946e654ebf0db32ea9038cece
parent4626aace1b0fafeca87ae2223826f850c55a1bce
parent66581ed768a430adc3e6a630948c28bfe6c32aa4
Merge "Legacy Size negotiation mapper" into devel/master
automated-tests/src/dali-toolkit/CMakeLists.txt
dali-toolkit/devel-api/layouting/layout-group-impl.cpp
dali-toolkit/internal/file.list