Merge branch 'devel/master' into tizen 24/71024/1 accepted/tizen/common/20160524.150524 accepted/tizen/common/20160525.160509 accepted/tizen/ivi/20160525.062209 accepted/tizen/ivi/20160526.003816 accepted/tizen/mobile/20160525.062309 accepted/tizen/mobile/20160526.003648 accepted/tizen/tv/20160525.062140 accepted/tizen/tv/20160526.003723 accepted/tizen/wearable/20160525.062236 accepted/tizen/wearable/20160526.003748 submit/tizen/20160524.015112 submit/tizen/20160525.015808 submit/tizen/20160525.140602
-rw-r--r-- 316 .gitignore
-rw-r--r-- 10238 LICENSE
-rw-r--r-- 1974 README
drwxr-xr-x - build
drwxr-xr-x - builder
-rw-r--r-- 68 com.samsung.dali-demo.manifest
-rw-r--r-- 315 com.samsung.dali-demo.manifest-smack
-rw-r--r-- 916 com.samsung.dali-demo.rule
-rw-r--r-- 11877 com.samsung.dali-demo.xml
drwxr-xr-x - demo
drwxr-xr-x - emscripten-examples
drwxr-xr-x - examples
drwxr-xr-x - packaging
drwxr-xr-x - resources
drwxr-xr-x - shared