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
[dali_1.9.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
control
/
control-data-impl.h
diff --git
a/dali-toolkit/internal/controls/control/control-data-impl.h
b/dali-toolkit/internal/controls/control/control-data-impl.h
index
210f6e2
..
c561fdd
100755
(executable)
--- a/
dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/
dali-toolkit/internal/controls/control/control-data-impl.h
@@
-290,9
+290,9
@@
public:
bool IsResourceReady() const;
/**
- * @copydoc CustomActorImpl::OnS
tag
eDisconnection()
+ * @copydoc CustomActorImpl::OnS
cen
eDisconnection()
*/
- void OnS
tag
eDisconnection();
+ void OnS
cen
eDisconnection();
/**
* @brief Sets the margin.