-
Conflicts: demo/dali-demo.cpp demo/dali-table-view.cpp examples/builder/examples.cpp examples/buttons/buttons-example.cpp examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp examples/text-view/text-view-example.cpp shared/view.h Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0
-
Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2
-
Conflicts: examples/text-view/text-view-example.cpp Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a
-
Update for following changes in dali-core: Actor::MoveBy -> TranslateBy Actor::ColorBy -> <removed> Actor::OpacityBy -> <removed> Actor::SetRotation -> SetOrientation Actor::GetCurrentRotation -> GetCurrentOrientation Actor::GetCurrentWorldRotation -> GetCurrentWorldOrientation Actor::SetInheritRotation -> SetInheritOrientation Actor::IsRotationInherited -> IsOrientationInherited Actor::Property::ROTATION -> Actor::Property::ORIENTATION Actor::Property::WORLD_ROTATION -> Actor::Property::WORLD_ORIENTATION Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION Change-Id: I0e883d5588e2f18beba32d64a2407253fe1fb286
-
Conflicts: examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp Change-Id: I6a266274f476748bf34a97652964f501f44fe00c
-
Change-Id: I18d69dba01824ffaa1cd3a4c6b9ead3a38981bc7
-
Change-Id: If1cef63c5c63a2c4278406856e5701ef1abbcf82
-
Conflicts: build/tizen/examples/CMakeLists.txt demo/dali-demo.cpp examples/buttons/buttons-example.cpp examples/item-view/item-view-example.cpp examples/text-view/text-view-example.cpp Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007
-
Change-Id: I4a723457a7cfaca87a20f771aa64f187ea160453