From: Heeyong Song Date: Tue, 21 Aug 2018 00:16:38 +0000 (+0000) Subject: Merge "Add ImageVisualShaderFactory" into devel/master X-Git-Tag: dali_1.3.38~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=aefe38ba476a1f7899b10fcb1481bde3b5ba906a;hp=70cda53a32b66bcc77619835cc06049635043d91 Merge "Add ImageVisualShaderFactory" into devel/master --- diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 7c62965..5fb5321 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 = 3; -const unsigned int TOOLKIT_MICRO_VERSION = 36; +const unsigned int TOOLKIT_MICRO_VERSION = 37; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 1cafb29..313f705 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.3.36 +Version: 1.3.37 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT