Merge remote-tracking branch 'origin/tizen' into new_text 50/37850/3
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:38:23 +0000 (11:38 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:59:36 +0000 (11:59 +0100)
commit163a83fe9fd3f76f733da6bad06e1e67dac8b870
tree5fce4872041ad00cb240348f76f931a3a3c3aec9
parent8d38197a421af87bbe3f598fc248c7fa2a55d72d
parentfa811aa9edaf56ac8507dcb70dcb9b151b1bb215
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
demo/dali-table-view.cpp
examples/item-view/item-view-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
examples/text-view/text-view-example.cpp

Change-Id: I4b9a9eb30ad190b329115ff093120ac06343e26d
19 files changed:
demo/dali-table-view.cpp
examples/animated-shapes/animated-shapes-example.cpp
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/item-view/item-view-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/radial-menu/radial-menu-example.cpp
examples/scroll-view/scroll-view-example.cpp
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
examples/text-field/text-field-example.cpp
examples/text-label-multi-language/text-label-multi-language-example.cpp
examples/text-label/text-label-example.cpp
packaging/com.samsung.dali-demo.spec
shared/view.h