Merge "Move TextSelectionPopup from public to devel" into tizen
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 26 May 2015 14:28:30 +0000 (07:28 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 26 May 2015 14:28:30 +0000 (07:28 -0700)
1  2 
dali-toolkit/dali-toolkit.h
dali-toolkit/public-api/file.list

Simple merge
index fcd4635db3d7e1f89f44a393e2641e4b3b200c14,3bd88d8665814e81977b37912a2a65926a056e37..d64c5d248a66488ca79cd8b9d187a357988d6879
@@@ -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 \