Merge branch 'devel/master' into tizen

diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
index 5256361..6f3784f 100644 (file)
--- a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.cpp
@@ -83,7 +83,8 @@ TapGestureDetector::TapGestureDetector(unsigned int tapsRequired)
   mTouchesRequired(DEFAULT_TOUCHES_REQUIRED),
   mTimerId(0),
   mTappedActor(),
-  mTap()
+  mTap(),
+  mReceiveAllTapEvents(false)
 {
 }
 
@@ -233,4 +234,4 @@ void TapGestureDetector::OnActorDestroyed(Object& object)
 
 } // namespace Internal
 
-} // namespace Dali
\ No newline at end of file
+} // namespace Dali

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index 372a48e..62950b7 100644 (file)
--- 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 = 41;
+const uint32_t    CORE_MICRO_VERSION = 42;
 const char* const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali.spec b/packaging/dali.spec
index e5aa48e..9f28a33 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali2
 Summary:    DALi 3D Engine
-Version:    2.0.41
+Version:    2.0.42
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT