Peter M. Groen / dali-demo

Change-Id: If57f3813648b47a811fdc62ed94e9142cece567c

Change-Id: Ia37d31f8d4e4b0f1d54a9da109c8e0bd159191a6

Change-Id: I6a31b30255d5a0d53d17ac8d2d75dba1539617b0

Change-Id: Ia0cd02c19c09302aaf71e311c9630b70f0b0d998

Change-Id: I9cbeacbec2990011a1c770608e7cff45e2bd6bb2

Change-Id: I92e974a578824d940629dd2ff1f6b32f260f29df

Change-Id: I056891670adc11824ac3cb34778fcedb70934972

Change-Id: I271639b4d44332759304e608198b17358241e0d1

Change-Id: If97fc764d066b74277011e5a77f6b5d5f5cbb473

Change-Id: I1d9b7a8c1cb7753fe22e08195a6b191a754b336c

Change-Id: I96f8837131306cbba8d2138c9689a8b4978b0998

Change-Id: I19abff8f9031a46410be2690e140c11facbd661b

Change-Id: I8af8d73e0ec58d3573c57ce3d52eb6bce8e786a7

Change-Id: Ic2910e0733f2097f5d7a0fa3a041143900aec4dc

Change-Id: I17d85a279cc0cf8f2954541a3cf4fbf809b7249f

Change-Id: I110536b17bb7f6fdc60e80c1a352ac2ad11d1adc

Change-Id: I86cd3b11b3c439403d8c0a0bd381ff9e19440220

Change-Id: I9b426848869179c2b40e099e09aa9e1c79701e03

Change-Id: I3d9b0b7fd1af9ef46697dd694b6d15c21c4b2956

Change-Id: I54a85ce8f45341ce893c058007614e4440d5b3d1

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

Change-Id: I54c61b8b44c334b7ef79dbd90c81b402a6649d87

Change-Id: Ib5a83c7729f9ac5ac426af2a7cac9adfeb240028

Change-Id: Ifd3f9da40caefe89caab105d03167a977b31182e

This reverts commit 8e073e809cf13a74699ccfa8f683d34ac26c6421.

Change-Id: I11d8dcf0812fb1c349eb1513332a28f650c5e3ca

Change-Id: I041904635a70e1dce3a3b6273987a0bcd12a8385

Change-Id: Ic5d6475baaf2586da7f8029323343f35dcf4441d

Change-Id: I97463b0a4ba89a5950386238150c8f43713eee92

Change-Id: I669a41072a93c2eba8f1367657778fc72d53eb70

Change-Id: I2195d137fdc0091f29e395ee5b63b9cf4a90f1d5

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

Change-Id: Ib6ce7c0a390be1d65546b2802da57c0042ec043c

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: I05a17ea530a14e94040f24db332178335ce3ce52

Change-Id: I2c5814f4c364e7fe1baf8da352c100529fc074ab

Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f

Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d

Change-Id: Id953da32620c4a3c57519cf9f5ecd74eb765a430

Change-Id: Ifa5f15cfd57ee71294bc52af0d7b394ff6a5d64a

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