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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / navigation-frame / navigation-tool-bar.h

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
similarity index 100%
rename from optional/dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h
rename to dali-toolkit/internal/controls/navigation-frame/navigation-tool-bar.h