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

Change-Id: Ie995ce8342cd34be613210b0934b43a51cf77600

[dali_1.1.38] Merge branch 'devel/master'
Change-Id: Ie995ce8342cd34be613210b0934b43a51cf77600
Xiangyin Ma
2 parents 661bf429 26c9e247
Showing 2 changed files with 2 additions and 2 deletions
examples/atlas/atlas-example.cpp
packaging/com.samsung.dali-demo.spec
@@ -200,7 +200,7 @@ private:
     return imageData;
   }
  
-  PixelDataPtr CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height )
+  PixelData CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height )
   {
     unsigned int size = width*height;
     unsigned char* pixels = new unsigned char [size*3u];
@@ -2,7 +2,7 @@
  
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.1.37
+Version:    1.1.38
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0