From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 26 May 2017 12:34:38 +0000 (+0000)
Subject: Merge "DALi Version 1.2.41" into devel/master
X-Git-Tag: dali_1.2.42~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=971fcd04008fe450010ae860e068681c805ceb59;hp=5c2f973a1f5564a49f20d05c81e75c6b7cff52df;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "DALi Version 1.2.41" into devel/master
---

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index 7ddc8c6..3628b39 100644
--- a/adaptors/public-api/dali-adaptor-version.cpp
+++ b/adaptors/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 2;
-const unsigned int ADAPTOR_MICRO_VERSION = 40;
+const unsigned int ADAPTOR_MICRO_VERSION = 41;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 18bafc7..3e67986 100644
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -14,7 +14,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.2.40
+Version:    1.2.41
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT