From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 13 Mar 2015 11:01:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: dali_1.0.38~11^2~58
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3b1fb566901d21b8303d9be3308e3920f5182e6d;hp=-c

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	dali-toolkit/public-api/controls/text-input/text-input.h
	dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I4ccad81fa1733cd86a88f667354d643b0e04fef0
---

3b1fb566901d21b8303d9be3308e3920f5182e6d
diff --combined packaging/dali-toolkit.spec
index 912c7a9,d2a0dc4..921e2dc
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       dali-toolkit
  Summary:    The OpenGLES Canvas Core Library Toolkit
- Version:    1.0.32
+ Version:    1.0.33
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -16,6 -16,7 +16,6 @@@ BuildRequires:  pkgconfig(dlog
  BuildRequires:  boost-devel
  BuildRequires:  pkgconfig(dali)
  BuildRequires:  pkgconfig(dali-core)
 -BuildRequires:  fribidi-devel
  
  %description
  The OpenGLES Canvas Core Library Toolkit - a set of controls that provide