Merge base & optional

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / shader-effects / bubble-effect / color-adjuster.cpp

diff --git a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
index 885d9e8..c0a2b19 100644 (file)
--- a/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
+++ b/dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.cpp
@@ -1,19 +1,21 @@
-//
-// 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.
+ *
+ */
 
+// CLASS HEADER
 #include "color-adjuster.h"
 
 namespace Dali
@@ -21,10 +23,12 @@ namespace Dali
 
 namespace Toolkit
 {
+
 namespace
 {
-  const std::string HSVDELTA_PROPERTY_NAME("uHSVDelta");
+const std::string HSVDELTA_PROPERTY_NAME("uHSVDelta");
 }
+
 ColorAdjuster::ColorAdjuster()
 {
 }