-
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
-
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com> Change-Id: I7629356cb2678ee8eda85eff0cbef6a530ab7a17
-
Conflicts: examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp Change-Id: I6a266274f476748bf34a97652964f501f44fe00c
-
Change-Id: I359790799ebf64ac5fd4e988e569dada337dd9f8
-
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: Ie3085ce4986965da3743efc9ab6585176d0cdb23
-
New Structure: build | tizen builder | dali-builder.cpp demo | [demo source & header files] examples | [example-name] | | [example source files] packaging | com.samsung.dali-demo.spec resources | images | | [all images] | models | | [all models] | scripts | | [all scripts] shared | view.h Now, each example should be in its own subdirectory within the "examples" directory. This will get automatically built. README also updated. Change-Id: Idae4cedf220698a4a2d928535cff88e8bf25f82a
-
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
-
Change-Id: I7a7f59aa5f557a8a57385e876fd881d87c101a28
-
Change-Id: Ifdee5c061cedaf271fac15479a6e403ef161d527
-
Conflicts: demo/dali-table-view.cpp Change-Id: Ib0075b320a16327e57d7eb2375082c8c4102f8a3
-
Change-Id: I9a960977be044f86612f45782bccc26496a08634
-
Change-Id: I7bf40e4c988f4739dd3cf9c42ac85f47701a5030
-
Change-Id: I766499cbf26b9f3cf263ad95801883e685c51fda
-
Change-Id: I45c78efe873cacac1465d2ca9cc5adcfd3042699
-
Change-Id: Icfa59efe128131186ef4403b5f3567dd8d87eb8a
-
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com> Change-Id: If7a8d36638c48210de27a66f8a1d06fed9983394
-
Change-Id: I02c2df1a9bb89cb26b813539fd1def5d10c582f8 Signed-off-by: David Steele <david.steele@partner.samsung.com>
-
Change-Id: Ife2ce513b18a50e02024e418294c2fbcdb9e413d Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>