projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: d9c164e)
Merge branch 'devel/new_mesh' into devel/master 86/42386/2
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:24:45 +0000 (15:24 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 16:00:45 +0000 (17:00 +0100)
Change-Id: I41d2ce44857efc23c3a830ede52849b4d415b6f6

dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp patch | blob | history

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
Domain: Graphics System / DALi;