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 remote-tracking branch 'origin/tizen' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.h
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.h
b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index
2b0c851
..
2b8a122
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.h
@@
-20,7
+20,7
@@
// EXTERNAL INCLUDES
#include <stdint.h>
#include <dali/public-api/common/dali-vector.h>
// EXTERNAL INCLUDES
#include <stdint.h>
#include <dali/public-api/common/dali-vector.h>
-#include <dali/
public
-api/images/atlas.h>
+#include <dali/
devel
-api/images/atlas.h>
#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/shader-effects/material.h>
#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/shader-effects/material.h>
@@
-409,4
+409,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif // __DALI_TOOLKIT_ATLAS_MANAGER_H__
\ No newline at end of file
+#endif // __DALI_TOOLKIT_ATLAS_MANAGER_H__