projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Do not change BlendMode by following whether advanced blend equation is appied...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visuals
/
color-visual-properties-devel.h
diff --git
a/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
b/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
index
654b290
..
d325a9c
100644
(file)
--- a/
dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
+++ b/
dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
@@
-23,20
+23,15
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
-
namespace DevelColorVisual
{
namespace DevelColorVisual
{
-
/**
* @brief Additional ColorVisual Properties.
*/
namespace Property
{
/**
* @brief Additional ColorVisual Properties.
*/
namespace Property
{
-
/**
* @brief Enumeration for the instance of additional properties belonging to the ColorVisual.
*/
/**
* @brief Enumeration for the instance of additional properties belonging to the ColorVisual.
*/
@@
-65,11
+60,7
@@
enum
} // namespace Property
} // namespace Property
-} // namespace ColorVisual
-
-/**
- * @}
- */
+} // namespace DevelColorVisual
} // namespace Toolkit
} // namespace Toolkit