From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 28 Aug 2018 10:38:15 +0000 (+0000)
Subject: Merge "Modify linebreak unit when creating LineLayout" into devel/master
X-Git-Tag: dali_1.3.39~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b11fd29e45c9c10a5e7086d75c37aa1a0d923d27;hp=87ee192bc7f97c78faea025484fc90ac231cfd81

Merge "Modify linebreak unit when creating LineLayout" into devel/master
---

diff --git a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h
index d102d4f..53d54a9 100644
--- a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h
+++ b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h
@@ -41,7 +41,7 @@ namespace PlaceHolder
 {
 
 /**
- * @brief Placeholder text Propeties used by Text controls to show placeholder
+ * @brief Placeholder text Properties used by Text controls to show placeholder
  * @SINCE_1_2.62
  *
  */