From: Seungho, Baek Date: Tue, 17 Sep 2019 04:32:50 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: submit/tizen/20190917.064531^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=bd76eb32f79e470ae91c31c94c191432e0fca639;hp=ab8af0af3a2a1c4e6ae468f2f4fa0110cb5a42ec Merge branch 'devel/master' into tizen --- diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index a9bc5d8..d9821bd 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -2,14 +2,13 @@ - Jonghyun Ho - DALi demo Application + DALi Demo Application /usr/share/icons/com.samsung.dali-demo.png - + - + /usr/share/icons/dali-examples.png @@ -17,14 +16,23 @@ /usr/share/icons/dali-tests.png - - + + + + + - - + + - - + + + + + + + + @@ -32,104 +40,83 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -137,80 +124,80 @@ - - - - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -218,99 +205,110 @@ + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + http://tizen.org/privilege/mediastorage diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index c36f822..f271b24 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.4.36 +Version: 1.4.37 Release: 1 Group: System/Libraries License: Apache-2.0