[dali_1.0.29] Merge branch 'tizen'

Change-Id: I513288ceaad4861c8bb7396543d250d26968a441

diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index 4302665..aee8adc 100644 (file)
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -236,7 +236,6 @@ public:
     mMagnifier.SetSourceActor( mView.GetBackgroundLayer() );
     mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width );  // Size of magnifier is in relation to stage width
     mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
-    mMagnifier.SetFrameVisibility(false);
     mMagnifier.SetScale(Vector3::ZERO);
     overlay.Add( mMagnifier );
 

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index 8665067..6416f34 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.0.28
+Version:    1.0.29
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0