[dali_1.2.34] Merge branch 'devel/master'

Change-Id: I314d4c1087cbcd5a43a49ad36bdd5395e309d1e9

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index 66061f2..a807abe 100644 (file)
--- 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 = 33;
+const unsigned int ADAPTOR_MICRO_VERSION = 34;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/doc/dali-adaptor-doc.h b/doc/dali-adaptor-doc.h
index 380e741..66587d1 100644 (file)
--- a/doc/dali-adaptor-doc.h
+++ b/doc/dali-adaptor-doc.h
@@ -55,7 +55,7 @@
  *
  * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
  *
- * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tizen-studio/native-tools/configuring-your-app/manifest-text-editor#feature"><b>Feature Element</b>.</a>
  *
  * \endif
  *

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 5e701ce..f1c8691 100644 (file)
--- 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.33
+Version:    1.2.34
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT