From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 14 Oct 2015 13:52:10 +0000 (-0700)
Subject: Merge "Comment correction for Disambiguated function" into devel/master
X-Git-Tag: dali_1.1.7~15
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f8eb4b2cbfc85c687e49759d79698046ebe2d201;hp=18c250b7c2de9dba09bff61a6425c67f490e5d41

Merge "Comment correction for Disambiguated function" into devel/master
---

diff --git a/dali-toolkit/internal/builder/builder-set-property.cpp b/dali-toolkit/internal/builder/builder-set-property.cpp
index c78e19c..c2d77a7 100644
--- a/dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/dali-toolkit/internal/builder/builder-set-property.cpp
@@ -102,7 +102,7 @@ Vector4 HexStringToVector4( const char* s )
 /**
  * A property value type can be forced when its unknown by a disambiguation convention in the json
  * ie  "myarray": [1,2,3,4] ; would be a vector but
- *     "myarray": {'type-cast':'array', 'value':[1,2,3,4]} would be an array
+ *     "myarray": {"type-cast":"array", "value":[1,2,3,4]} would be an array
  * @param child The node whos string to search for a disambiguated type
  * @param value The value to set
  * @param overrideMap The user overriding constant map