From: Paul Wisbey <p.wisbey@samsung.com>
Date: Mon, 9 Feb 2015 11:17:33 +0000 (-0800)
Subject: Merge "Basic text rendering back-end (reference implemenation)" into new_text
X-Git-Tag: new_text_0.1~54
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c53a59521473d7362235aebf58c99b85734b83e6

Merge "Basic text rendering back-end (reference implemenation)" into new_text
---

c53a59521473d7362235aebf58c99b85734b83e6
diff --cc base/dali-toolkit/public-api/file.list
index bcb0e2f,0d49c4f..1b3f5d3
--- a/base/dali-toolkit/public-api/file.list
+++ b/base/dali-toolkit/public-api/file.list
@@@ -42,9 -42,7 +42,8 @@@ public_api_base_src_files = 
    $(public_api_base_src_dir)/controls/text-controls/text-label.cpp \
    $(public_api_base_src_dir)/text/character-set-conversion.cpp \
    $(public_api_base_src_dir)/text/logical-model.cpp \
 +  $(public_api_base_src_dir)/text/multi-language-support.cpp \
    $(public_api_base_src_dir)/text/text-controller.cpp \
-   $(public_api_base_src_dir)/text/text-renderer.cpp \
    $(public_api_base_src_dir)/text/text-view.cpp \
    $(public_api_base_src_dir)/text/text-view-interface.cpp \
    $(public_api_base_src_dir)/text/visual-model.cpp \
@@@ -127,10 -128,8 +129,9 @@@ public_api_base_text_controls_header_fi
  public_api_base_text_header_files = \
    $(public_api_base_src_dir)/text/character-set-conversion.h \
    $(public_api_base_src_dir)/text/logical-model.h \
 +  $(public_api_base_src_dir)/text/multi-language-support.h \
    $(public_api_base_src_dir)/text/text-controller.h \
    $(public_api_base_src_dir)/text/text-definitions.h \
-   $(public_api_base_src_dir)/text/text-renderer.h \
    $(public_api_base_src_dir)/text/text-view.h \
    $(public_api_base_src_dir)/text/text-view-interface.h \
    $(public_api_base_src_dir)/text/visual-model.h