Merge remote-tracking branch 'origin/tizen' into new_text 89/35889/2
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 25 Feb 2015 13:55:36 +0000 (13:55 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 25 Feb 2015 14:35:19 +0000 (14:35 +0000)
commit1e8cf4e9b7b912503aee6bc3494217e88d13ef52
tree3e62521e41345b044cb2684790e2d710edae27c4
parentfb15a4a79e4c087a7b5d34e4ebe12b728295ad86
parent91e13a2ffb4b09efd46ab01fbf415e03a12b8954
Merge remote-tracking branch 'origin/tizen' into new_text

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
17 files changed:
demo/dali-table-view.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
examples/hello-world/hello-world-example.cpp
examples/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/item-view/item-view-example.cpp
examples/logging/logging-example.cpp
examples/motion/motion-blur-example.cpp
examples/motion/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/scroll-view/scroll-view-example.cpp
examples/shader-effect/dissolve-effect-example.cpp
examples/shadows/shadow-bone-lighting-example.cpp
examples/shared/view.h
examples/transition/cube-transition-effect-example.cpp
packaging/com.samsung.dali-demo.spec