Peter M. Groen / dali-demo

Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

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: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: I8609692959d95f0ee58213d9271a014ba85fb49d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Conflicts:
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp

Change-Id: I6a266274f476748bf34a97652964f501f44fe00c

Change-Id: I680700e541ac44ef0695250ba4083f7770361a3e

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