Peter M. Groen / dali-demo

Commit e763c0310addba03f301415d7e0d819929126f15

Authored by Lee Morgan
2 parents 5d1b1b8c 6b1c0fad

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

Change-Id: I01576ef2fed686f1d8a48db484ae3393226ec954
Inline Side-by-side
Showing 2 changed files with 1 additions and 8 deletions
packaging/com.samsung.dali-demo.spec
  View file @e763c03
@@ -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.1.15 5 +Version: 1.1.16
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
shared/view.h
  View file @e763c03
@@ -26,13 +26,6 @@ @@ -26,13 +26,6 @@
26 namespace DemoHelper 26 namespace DemoHelper
27 { 27 {
28 28
29 -enum ControlDepthIndexRanges  
30 -{  
31 - BACKGROUND_DEPTH_INDEX = -10000000,  
32 - CONTENT_DEPTH_INDEX = 0,  
33 - DECORATION_DEPTH_INDEX = 10000000  
34 -};  
35 -  
36 /** 29 /**
37 * Provide a style for the view and its tool bar. 30 * Provide a style for the view and its tool bar.
38 */ 31 */