From: Kimmo Hoikka Date: Fri, 17 Jun 2016 12:25:26 +0000 (-0700) Subject: Merge "(Automated Tests) Synchronised common files with Core" into devel/master X-Git-Tag: dali_1.1.40~8 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=124b37e4664e47f0fc5fd2f16427b25b66d6ebaf;hp=471657912f53a37f832a6b4f5f8513cbc62a32e1 Merge "(Automated Tests) Synchronised common files with Core" into devel/master --- diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index adba36a..ef55c84 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/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 = 1; -const unsigned int TOOLKIT_MICRO_VERSION = 38; +const unsigned int TOOLKIT_MICRO_VERSION = 39; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 4a41cad..7ec107a 100644 --- 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.1.38 +Version: 1.1.39 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-2-Clause and MIT