projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: ba35322)
[dali_1.0.19] Merge branch 'release19' 44/30944/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 27 Nov 2014 11:35:28 +0000 (11:35 +0000)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 27 Nov 2014 11:38:14 +0000 (11:38 +0000)
Change-Id: I9f5b78fe4a6f74d1fedb680fc41b423d2485a51e

optional/dali-toolkit/public-api/dali-toolkit-version.cpp patch | blob | history
packaging/dali-toolkit.spec patch | blob | history

diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
index ccc97e8..7de9ea8 100644 (file)
--- a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 18;
+const unsigned int TOOLKIT_MICRO_VERSION = 19;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 745ee69..2d1fffa 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.18
+Version:    1.0.19
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
Domain: Graphics System / DALi;