From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 13 Feb 2015 17:36:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: new_text_0.1~47
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682;hp=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682

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

Conflicts:
	base/dali-toolkit/internal/file.list
	base/dali-toolkit/public-api/file.list
	build/tizen/dali-toolkit/Makefile.am
	dali-toolkit/dali-toolkit.h
	dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
	dali-toolkit/internal/controls/text-input/text-input-handles-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-handles-impl.h
	dali-toolkit/internal/controls/text-input/text-input-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-impl.h
	dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-popup-impl.h
	dali-toolkit/internal/controls/text-input/text-input-popup-new-impl.h
	dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h
	dali-toolkit/internal/controls/text-input/text-input-text-style-impl.h
	dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h
	dali-toolkit/internal/controls/text-view/relayout-utilities.cpp
	dali-toolkit/internal/controls/text-view/relayout-utilities.h
	dali-toolkit/internal/controls/text-view/split-by-char-policies.cpp
	dali-toolkit/internal/controls/text-view/split-by-char-policies.h
	dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.cpp
	dali-toolkit/internal/controls/text-view/split-by-new-line-char-policies.h
	dali-toolkit/internal/controls/text-view/split-by-word-policies.cpp
	dali-toolkit/internal/controls/text-view/split-by-word-policies.h
	dali-toolkit/internal/controls/text-view/text-actor-cache.cpp
	dali-toolkit/internal/controls/text-view/text-actor-cache.h
	dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.cpp
	dali-toolkit/internal/controls/text-view/text-processor-bidirectional-info.h
	dali-toolkit/internal/controls/text-view/text-processor.cpp
	dali-toolkit/internal/controls/text-view/text-processor.h
	dali-toolkit/internal/controls/text-view/text-view-character-processor.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.h
	dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.cpp
	dali-toolkit/internal/controls/text-view/text-view-paragraph-processor.h
	dali-toolkit/internal/controls/text-view/text-view-processor-dbg.cpp
	dali-toolkit/internal/controls/text-view/text-view-processor-dbg.h
	dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.cpp
	dali-toolkit/internal/controls/text-view/text-view-processor-helper-functions.h
	dali-toolkit/internal/controls/text-view/text-view-processor-types.h
	dali-toolkit/internal/controls/text-view/text-view-processor.cpp
	dali-toolkit/internal/controls/text-view/text-view-processor.h
	dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
	dali-toolkit/internal/controls/text-view/text-view-word-processor.h
	dali-toolkit/public-api/controls/text-input/text-input.cpp
	dali-toolkit/public-api/controls/text-input/text-input.h
	dali-toolkit/public-api/controls/text-view/text-view.cpp
	dali-toolkit/public-api/controls/text-view/text-view.h
	dali-toolkit/public-api/markup-processor/markup-processor.cpp
	dali-toolkit/public-api/markup-processor/markup-processor.h

Change-Id: I9f3dcc5bba104f4cac0589eddad4ad1de31cc740
---