Merge branch 'devel/master' into tizen 24/97824/1 accepted/tizen/common/20161115.201044 accepted/tizen/ivi/20161115.234657 accepted/tizen/mobile/20161115.234506 accepted/tizen/tv/20161115.234548 accepted/tizen/wearable/20161115.234623 submit/tizen/20161115.111846
-rw-r--r-- 453 .gitignore
-rw-r--r-- 10238 LICENSE
-rw-r--r-- 2652 README.md
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-- 13223 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