From: joogab yun Date: Mon, 17 Jun 2019 02:11:07 +0000 (+0000) Subject: Merge "Text Fit - Adjust the text point size to match the size of the TextLabel.... X-Git-Tag: dali_1.4.25~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a084ac1cd22b1b24be2d5ed935804ef9102965a7;hp=a267f3da043b1b792ffc64d1848542aa761e44c0 Merge "Text Fit - Adjust the text point size to match the size of the TextLabel." into devel/master --- diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index e9c1a6a..1aff4b3 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 = 4; -const unsigned int TOOLKIT_MICRO_VERSION = 23; +const unsigned int TOOLKIT_MICRO_VERSION = 24; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 3289751..82ba193 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.4.23 +Version: 1.4.24 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT