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 new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
bouncing-effect-actor.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index
4e3bb67
..
a4f1ffb
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@
-19,14
+19,14
@@
#include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
// EXTERNAL INCLUDES
+#include <math.h>
#include <dali/public-api/actors/mesh-actor.h>
#include <dali/public-api/actors/mesh-actor.h>
-#include <dali/public-api/
geometry/animatable-mesh
.h>
+#include <dali/public-api/
animation/active-constraint
.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/geometry/animatable-mesh.h>
#include <dali/public-api/shader-effects/shader-effect.h>
#include <dali/public-api/math/vector3.h>
#include <dali/public-api/shader-effects/shader-effect.h>
#include <dali/public-api/math/vector3.h>
-#include <math.h>
-
namespace Dali
{
namespace Dali
{