Merge branch 'devel/master' into tizen 42/60142/2 accepted/tizen/common/20160302.194056 accepted/tizen/ivi/20160302.073538 accepted/tizen/mobile/20160302.073330 accepted/tizen/tv/20160302.073410 accepted/tizen/wearable/20160302.073514 submit/tizen/20160226.050811 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
-rw-r--r-- 316 .gitignore
-rw-r--r-- 10238 LICENSE
-rw-r--r-- 1446 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-- 10491 com.samsung.dali-demo.xml
drwxr-xr-x - demo
drwxr-xr-x - examples
drwxr-xr-x - packaging
drwxr-xr-x - resources
drwxr-xr-x - shared