diff options
| author | Heeyong Song <heeyong.song@samsung.com> | 2017-03-20 11:23:16 +0900 |
|---|---|---|
| committer | Heeyong Song <heeyong.song@samsung.com> | 2017-03-20 11:23:33 +0900 |
| commit | f96f06b300619fc91e0cf837a437a730aff350a4 (patch) | |
| tree | 3347fe52f7df017b6c316efa3031e1e55fa0830d | |
| parent | 8486f56d11fc74251ac1d86fe5307c5fe8a35b24 (diff) | |
| parent | a37a76bd2443b56df1489bd6b04bacc63ce29708 (diff) | |
| download | dali-demo-f96f06b300619fc91e0cf837a437a730aff350a4.tar.gz dali-demo-f96f06b300619fc91e0cf837a437a730aff350a4.tar.bz2 dali-demo-f96f06b300619fc91e0cf837a437a730aff350a4.zip | |
Merge branch 'devel/master (1.2.31)' into tizensubmit/tizen/20170324.082849submit/tizen/20170320.091401accepted/tizen/wearable/20170324.112057accepted/tizen/wearable/20170320.223013accepted/tizen/unified/20170324.112226accepted/tizen/unified/20170320.223119accepted/tizen/tv/20170324.111935accepted/tizen/tv/20170320.222911accepted/tizen/mobile/20170324.111710accepted/tizen/mobile/20170320.222645accepted/tizen/ivi/20170324.112153accepted/tizen/ivi/20170320.223056accepted/tizen/common/20170324.123047accepted/tizen/common/20170320.173855
Change-Id: I642f6a50947051b11977f238a8a8210219a78497
| -rw-r--r-- | examples-reel/dali-examples-reel.cpp | 2 | ||||
| -rwxr-xr-x | packaging/com.samsung.dali-demo.spec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp index adc351d8..0576b07d 100644 --- a/examples-reel/dali-examples-reel.cpp +++ b/examples-reel/dali-examples-reel.cpp @@ -76,7 +76,7 @@ int DALI_EXPORT_API main(int argc, char **argv) demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE)); demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING)); - demo.AddExample(Example("texturedss-mesh.example", DALI_DEMO_STR_TITLE_TEXTURED_MESH)); + demo.AddExample(Example("textured-mesh.example", DALI_DEMO_STR_TITLE_TEXTURED_MESH)); demo.AddExample(Example("tilt.example", DALI_DEMO_STR_TITLE_TILT_SENSOR)); demo.AddExample(Example("tooltip.example", DALI_DEMO_STR_TITLE_TOOLTIP)); demo.AddExample(Example("transitions.example", DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS)); diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 1e3003c2..e8954937 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.2.30 +Version: 1.2.31 Release: 1 Group: System/Libraries License: Apache-2.0 |