Merge "Remove the actor from exclusive list in RenderTaskList when the actor is destr...

[platform/core/uifw/dali-core.git] / dali / public-api / common / view-mode.h

diff --git a/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h
index 76d954c..74187cd 100644 (file)
--- a/dali/public-api/common/view-mode.h
+++ b/dali/public-api/common/view-mode.h
@@ -1,24 +1,29 @@
 #ifndef __DALI_VIEW_MODE_H__
 #define __DALI_VIEW_MODE_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) 2015 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.
+ *
+ */
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_common
+ * @{
+ */
 
 /**
  * Stereoscopic view modes
@@ -31,6 +36,9 @@ enum ViewMode
   STEREO_INTERLACED  ///< Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames.
 };
 
+/**
+ * @}
+ */
 } // namespace Dali
 
 #endif // __DALI_VIEW_MODE_H__