From fd07098013f6492fa82305852fed028bbf963110 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 7 Apr 2014 15:43:49 +0100 Subject: [PATCH] Put scroll-connector.h in the capi folder [Issue#] N/A [Problem] dali-toolkit/capi for is out of sync with CAPI repository [Cause] scroll-connector.h was moved into CAPI [Solution] Put scroll-connector.h in the correct folder Change-Id: Ia503e4c0aff447d5df35e30eb5ab93615869ecbc Signed-off-by: Paul Wisbey --- .../dali-toolkit}/public-api/controls/scrollable/scroll-connector.h | 0 capi/dali-toolkit/public-api/file.list | 3 ++- dali-toolkit/public-api/file.list | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) rename {dali-toolkit => capi/dali-toolkit}/public-api/controls/scrollable/scroll-connector.h (100%) diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-connector.h b/capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h similarity index 100% rename from dali-toolkit/public-api/controls/scrollable/scroll-connector.h rename to capi/dali-toolkit/public-api/controls/scrollable/scroll-connector.h diff --git a/capi/dali-toolkit/public-api/file.list b/capi/dali-toolkit/public-api/file.list index 0ba0f28..af712f4 100644 --- a/capi/dali-toolkit/public-api/file.list +++ b/capi/dali-toolkit/public-api/file.list @@ -32,7 +32,8 @@ capi_devel_popup_header_files = \ capi_devel_scroll_component_header_files = capi_devel_scrollable_header_files = \ - $(capi_devel_src_dir)/controls/scrollable/scrollable.h + $(capi_devel_src_dir)/controls/scrollable/scrollable.h \ + $(capi_devel_src_dir)/controls/scrollable/scroll-connector.h capi_devel_item_view_header_files = \ $(capi_devel_src_dir)/controls/scrollable/item-view/grid-layout.h \ diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index 9fc10f2..670ffe0 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -150,8 +150,7 @@ public_api_popup_header_files = public_api_scroll_component_header_files = -public_api_scrollable_header_files = \ - $(public_api_src_dir)/controls/scrollable/scroll-connector.h +public_api_scrollable_header_files = public_api_scroll_view_header_files = \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \ -- 2.7.4