From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 19 Feb 2015 10:35:36 +0000 (-0800)
Subject: Merge "Typo fixed in Control implementation doc." into tizen
X-Git-Tag: dali_1.0.31~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=dc3613bb6248908c267a76e378b04962bce85664;hp=ee3bdc95f623f41feb37be10f21bef1d9da1e805

Merge "Typo fixed in Control implementation doc." into tizen
---

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 8a5c7e0..8133b26 100644
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -477,7 +477,7 @@ private:
   virtual void OnInitialize();
 
   /**
-   * @brief This method is called when the control is activates.
+   * @brief This method is called when the control is activated.
    *
    * Derived classes should override this if they wish to be notified when they are activated.
    */