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 branch 'devel/new_mesh' into devel/master
[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
177f927
..
d278eb4
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@
-63,7
+63,7
@@
uniform lowp vec4 uColor;\n
void main()\n
{\n
gl_FragColor = uColor;\n
-}\n
;
+}\n
);
} // namespace Anon