Merge "Move common images folder to the style folder" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Mon, 12 Oct 2015 14:54:43 +0000 (07:54 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 12 Oct 2015 14:54:43 +0000 (07:54 -0700)
dali-toolkit/public-api/dali-toolkit-version.cpp
packaging/dali-toolkit.spec

index a7b1d49..795e9cf 100644 (file)
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 5;
+const unsigned int TOOLKIT_MICRO_VERSION = 6;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
index b80108a..9939f2c 100644 (file)
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.1.5
+Version:    1.1.6
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0, BSD-2.0, MIT