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

Change-Id: I01576ef2fed686f1d8a48db484ae3393226ec954

[dali_1.1.16] Merge branch 'devel/master'
Change-Id: I01576ef2fed686f1d8a48db484ae3393226ec954
Lee Morgan
2 parents 5d1b1b8c 6b1c0fad
Showing 2 changed files with 1 additions and 8 deletions
packaging/com.samsung.dali-demo.spec
shared/view.h
@@ -2,7 +2,7 @@
  
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.1.15
+Version:    1.1.16
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -26,13 +26,6 @@
 namespace DemoHelper
 {
  
-enum ControlDepthIndexRanges
-{
-    BACKGROUND_DEPTH_INDEX    = -10000000,
-    CONTENT_DEPTH_INDEX       =  0,
-    DECORATION_DEPTH_INDEX    =  10000000
-};
-
 /**
  * Provide a style for the view and its tool bar.
  */