Merge changes I26f3edb0,Iba714851 into new_text
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 15:43:18 +0000 (08:43 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 9 Apr 2015 15:43:18 +0000 (08:43 -0700)
commit0a2f5e1551be90466c7b64173bd750c4009c744e
tree07e3fa5e6b23d3e9c7183d55526ea59896e3b321
parent52117490d94d8242addbe1608efe64364fdb308a
parent37998ba8d5d17e637fe80ff29a2622cc964fe82a
Merge changes I26f3edb0,Iba714851 into new_text

* changes:
  Removed a float equality comparision
  Merge remote-tracking branch 'origin/tizen' into new_text
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp