X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-component%2Fscroll-bar-internal.h;h=25169ec9a15e7ffa9b0e1325bd812bcee8beb391;hb=b458e407eba11c73f38da68bce8e967a30ea03e2;hp=47cf67c2dcbfed80b0e93e604532938535777d34;hpb=f77f0cb417df66a09f468c974e14b881142cf15b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
index 47cf67c..25169ec 100755
--- a/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar-internal.h
@@ -1,27 +1,28 @@
 #ifndef __DALI_TOOLKIT_SCROLL_BAR_INTERNAL_H__
 #define __DALI_TOOLKIT_SCROLL_BAR_INTERNAL_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scrollable//scroll-component.h>
+#include <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -29,7 +30,7 @@ namespace Toolkit
 
 // Forward declarations
 
-namespace Internal DALI_INTERNAL
+namespace Internal
 {
 // Forward declarations