From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 24 Sep 2015 13:09:46 +0000 (-0700)
Subject: Merge "Marked new API's since 1.1.4" into devel/master
X-Git-Tag: dali_1.1.4~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=618c084142032296c60a188b9438d63a81a2d264;hp=-c

Merge "Marked new API's since 1.1.4" into devel/master
---

618c084142032296c60a188b9438d63a81a2d264
diff --combined dali-toolkit/public-api/controls/control.h
index 1d8dd28,4a6d2af..bac8835
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@@ -89,7 -89,7 +89,7 @@@ public
      enum
      {
        STYLE_NAME = PROPERTY_START_INDEX,       ///< name "style-name",       @see SetStyleName,       type std::string
-       BACKGROUND,                              ///< name "background",       @see SetBackgroundImage, type Map
+       BACKGROUND,                              ///< name "background",       @see SetBackgroundImage, type Map,         @since DALi 1.1.4
        KEY_INPUT_FOCUS,                         ///< name "key-input-focus",  @see SetKeyInputFocus,   type bool
      };
    };
@@@ -279,6 -279,8 +279,6 @@@ public
    /**
     * @brief Sets an image as the background of the control.
     *
 -   * The color of this image is blended with the background color @see SetBackgroundColor
 -   *
     * @param[in] image The image to set as the background.
     */
    void SetBackgroundImage( Image image );