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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / text-controls / text-label.h

diff --git a/base/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
similarity index 100%
rename from base/dali-toolkit/public-api/controls/text-controls/text-label.h
rename to dali-toolkit/public-api/controls/text-controls/text-label.h