Merge "[3.0] Remove haptic APIs from feedback plugin" into tizen_3.0

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 e7b64d0..47bcf37 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -428,5 +428,6 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libdali-video-player-plugin.so*
+%license LICENSE
 %endif
 %endif