From: Wonsik Jung Date: Tue, 17 Aug 2021 23:52:31 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: accepted/tizen/unified/20210818.124550~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=e21b9bfa8bd58a8f66fe380bf5a67419bdb401f0;hp=fbc5b81d8e2ca36b97ba73bf0128add10e825088 Merge branch 'devel/master' into tizen --- diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp index 1f9e642..e0c29da 100644 --- a/dali/public-api/dali-core-version.cpp +++ b/dali/public-api/dali-core-version.cpp @@ -27,7 +27,7 @@ namespace Dali { const uint32_t CORE_MAJOR_VERSION = 2; const uint32_t CORE_MINOR_VERSION = 0; -const uint32_t CORE_MICRO_VERSION = 38; +const uint32_t CORE_MICRO_VERSION = 39; const char* const CORE_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali.spec b/packaging/dali.spec index 931de66..d09cca7 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -1,6 +1,6 @@ Name: dali2 Summary: DALi 3D Engine -Version: 2.0.38 +Version: 2.0.39 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT