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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-label-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
similarity index 100%
rename from base/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
rename to dali-toolkit/internal/controls/text-controls/text-label-impl.cpp