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 "Text - Stop destroying the text renderer when text decoration is updated....
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
alignment
/
alignment-impl.cpp
diff --git
a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index
f080ba3
..
ab8ff5c
100644
(file)
--- a/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@
-21,7
+21,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/object/property-input.h>
#include <dali/public-api/object/type-registry.h>
// EXTERNAL INCLUDES
#include <dali/public-api/object/property-input.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/
devel
-api/object/type-registry-helper.h>
+#include <dali/
public
-api/object/type-registry-helper.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
namespace Dali
#include <dali/public-api/size-negotiation/relayout-container.h>
namespace Dali