Peter M. Groen / dali-demo

Commit ad11ccbb29cb3912d3efb33703fff0871114ae18

Authored by thothamon
2 parents 7cc14ca9 cfe02c3a

[dali_1.3.37] Merge branch 'devel/master' 

Change-Id: I13f4469f520394a981ee93c990988d8bdfc9c750
Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
examples/layouting/grid-example.cpp
  View file @ad11ccb
@@ -62,7 +62,8 @@ namespace Demo @@ -62,7 +62,8 @@ namespace Demo
62 { 62 {
63 63
64 GridExample::GridExample() 64 GridExample::GridExample()
65 -: Example( TITLE ) 65 +: Example( TITLE ),
  66 + mToggleStatus( GRID_EXACT_WIDTH )
66 { 67 {
67 } 68 }
68 69
packaging/com.samsung.dali-demo.spec
  View file @ad11ccb
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.3.36 5 +Version: 1.3.37
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0