Merge branch 'devel/master (1.2.36+)' into tizen 43/126843/1
[platform/core/uifw/dali-demo.git] / demo /
drwxr-xr-x   ..
-rw-r--r-- 2254 dali-demo.cpp