Merge "Text selection refactoring" into devel/master

diff --git a/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
index cf36405..d325a9c 100644 (file)
--- a/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
@@ -62,10 +62,6 @@ enum
 
 } // namespace DevelColorVisual
 
-/**
- * @}
- */
-
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index 7d71948..7720d13 100644 (file)
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -463,7 +463,6 @@ public: // Intended for control developers
    *
    * @SINCE_1_0.0
    * @param[in] implementation The implementation for this control
-   * @return A handle to a newly allocated Dali resource
    * @note Should NOT be called to create a handle from the implementation. As stated, this allocates a NEW Dali resource.
    */
   explicit Control(Internal::Control& implementation);