Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 37/40737/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 8 Jun 2015 09:56:20 +0000 (10:56 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 8 Jun 2015 12:28:04 +0000 (13:28 +0100)
commit51a67042772c3a811a8a602a2f9339b90dc4b348
tree986a88d430f907ab5ee4343bc9ea6f61e58f43e3
parent0a0f03ab8c1d254ca5fc29934f4f9b5b115c98f2
parent8178ca9af93cf8f1d3f27bc48cfbb5797048f675
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67
demo/dali-table-view.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/cluster/cluster-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
examples/radial-menu/radial-menu-example.cpp
examples/refraction-effect/refraction-effect-example.cpp