Peter M. Groen / dali-demo

  • Merge remote-tracking branch 'origin/tizen' into new_text ...
    6ebeb640 
    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
    Paul Wisbey authored
     
    Browse File »