From: Adeel Kazmi Date: Fri, 18 Nov 2016 11:36:10 +0000 (-0800) Subject: Merge "DALi Version 1.2.15" into devel/master X-Git-Tag: dali_1.2.16~15 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=226eab9d4e2d21e85c774fa2baf05a00022dc8f7;hp=d0b03f52573948c53cdca89ec5e3be201737c3bb Merge "DALi Version 1.2.15" into devel/master --- diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 8cac8e3..bd25c80 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 = 2; -const unsigned int TOOLKIT_MICRO_VERSION = 14; +const unsigned int TOOLKIT_MICRO_VERSION = 15; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec index ef9b273..11112dc 100644 --- a/packaging/dali-addon.spec +++ b/packaging/dali-addon.spec @@ -1,6 +1,6 @@ Name: dali-addon Summary: DALi module for Node.JS -Version: 1.2.14 +Version: 1.2.15 Release: 1 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/packaging/dali-csharp-wrapper.spec b/packaging/dali-csharp-wrapper.spec index b8fb3ce..35c4e7e 100755 --- a/packaging/dali-csharp-wrapper.spec +++ b/packaging/dali-csharp-wrapper.spec @@ -1,6 +1,6 @@ Name: NDalic Summary: dali wrapper -Version: 1.2.14 +Version: 1.2.15 Release: 1 Group: uifw/graphic License: TO_BE_FILLED_IN diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 1ccf8e0..7af9db3 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.2.14 +Version: 1.2.15 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-2-Clause and MIT