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 "Internal::Control cleanup, remove dead an non-needed methods and adding missin...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
5055061
..
3bf70f2
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-34,7
+34,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/
public
-api/builder/json-parser.h>
+#include <dali-toolkit/
devel
-api/builder/json-parser.h>
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
#include <dali-toolkit/internal/builder/builder-filesystem.h>
#include <dali-toolkit/internal/builder/builder-get-is.inl.h>
#include <dali-toolkit/internal/builder/builder-filesystem.h>