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 (file)
--- 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
  *
  */