Merge branch 'devel/master' into tizen_4.0

Change-Id: I455f549ac1b7439e5861d27e3604e16e45ea91b5

diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp
index 230704a..783acbe 100644 (file)
--- a/examples/tilt/tilt-example.cpp
+++ b/examples/tilt/tilt-example.cpp
@@ -67,7 +67,7 @@ public:
   void CreateSensor()
   {
     mTiltSensor = TiltSensor::Get();
-    if ( mTiltSensor.Enable() )
+    if ( mTiltSensor.Start() )
     {
       // Get notifications when the device is tilted
       mTiltSensor.TiltedSignal().Connect( this, &TiltController::OnTilted );

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 95976c6..0e9e86b 100755 (executable)
--- 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.54
+Version:    1.2.56
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0