-
Conflicts: examples/text-view/text-view-example.cpp Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a
-
Change-Id: I300bf3260b3dfec153583e5b4c0c1ee6ee1eebea
-
Conflicts: build/tizen/CMakeLists.txt build/tizen/demo/CMakeLists.txt build/tizen/examples/CMakeLists.txt demo/dali-table-view.cpp examples/buttons/buttons-example.cpp examples/shader-effect/dissolve-effect-example.cpp examples/shadows/shadow-bone-lighting-example.cpp packaging/com.samsung.dali-demo.spec Change-Id: I57a2de5bfa6d0f05c02b8aba06dec9130f14a906
-
Follows core patch: https://review.tizen.org/gerrit/#/c/35596 , adaptor patch: https://review.tizen.org/gerrit/#/c/35597/ and toolkit patch: https://review.tizen.org/gerrit/#/c/35598/ Change-Id: I074c8b1b77d2da44067a0200e851291e21774f2c Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
-
Change-Id: I7bf40e4c988f4739dd3cf9c42ac85f47701a5030
-
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com> Change-Id: If7a8d36638c48210de27a66f8a1d06fed9983394
-
Change-Id: I61ff1f15154f7a80a0021215672f850176d910fc Signed-off-by: David Steele <david.steele@partner.samsung.com>
