Merge "Fix for the cursor position with the arabic script." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / atlas / atlas-manager.h

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
index 5542dd0..00fdc7a 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_ATLAS_MANAGER_H__
-#define __DALI_TOOLKIT_ATLAS_MANAGER_H__
+#ifndef DALI_TOOLKIT_ATLAS_MANAGER_H
+#define DALI_TOOLKIT_ATLAS_MANAGER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/images/buffer-image.h>
+#include <dali/public-api/rendering/texture-set.h>
 #include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/rendering/texture-set.h>
 
 namespace Dali
 {
@@ -283,4 +283,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_ATLAS_MANAGER_H__
+#endif // DALI_TOOLKIT_ATLAS_MANAGER_H