From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 16 Oct 2018 13:32:06 +0000 (+0000)
Subject: Merge "Legacy Size negotiation mapper" into devel/master
X-Git-Tag: dali_1.3.46~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7742c07e1fdc5d78bab7c2c9cc5d7803f04fb012;ds=sidebyside

Merge "Legacy Size negotiation mapper" into devel/master
---

7742c07e1fdc5d78bab7c2c9cc5d7803f04fb012
diff --cc automated-tests/src/dali-toolkit/CMakeLists.txt
index f193458,33adccc..ac4c3d5
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -26,8 -26,8 +26,9 @@@ SET(TC_SOURCE
    utc-Dali-JsonParser.cpp
    utc-Dali-KeyInputFocusManager.cpp
    utc-Dali-Layouting.cpp
+   utc-Dali-LayoutingResizePolicy.cpp
    utc-Dali-PageTurnView.cpp
 +  utc-Dali-Scene3dView.cpp
    utc-Dali-Script.cpp
    utc-Dali-ScrollBar.cpp
    utc-Dali-ScrollView.cpp