From: Paul Wisbey <p.wisbey@samsung.com>
Date: Tue, 26 May 2015 14:28:30 +0000 (-0700)
Subject: Merge "Move TextSelectionPopup from public to devel" into tizen
X-Git-Tag: accepted/tizen/common/20150529.134100~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ca85044443ecab7375b63c0a1c946c99a8bb77a4

Merge "Move TextSelectionPopup from public to devel" into tizen
---

ca85044443ecab7375b63c0a1c946c99a8bb77a4
diff --cc dali-toolkit/public-api/file.list
index fcd4635,3bd88d8..d64c5d2
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@@ -22,8 -22,8 +22,7 @@@ public_api_src_files = 
    $(public_api_src_dir)/controls/table-view/table-view.cpp \
    $(public_api_src_dir)/controls/text-controls/text-label.cpp \
    $(public_api_src_dir)/controls/text-controls/text-field.cpp \
-   $(public_api_src_dir)/controls/text-controls/text-selection-popup.cpp \
    $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
 -  $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \
    $(public_api_src_dir)/focus-manager/focus-manager.cpp \
    $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
    $(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \