projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 1c5674a)
Merge "Merge branch 'tizen' into devel/new_mesh" into devel/new_mesh
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 9 Jun 2015 09:50:57 +0000 (02:50 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 9 Jun 2015 09:50:58 +0000 (02:50 -0700)
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp patch | blob | history

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index 4ff070b..af57a7f 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -24,7 +24,6 @@
 #include <dali/public-api/images/resource-image.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/shader-effects/bubble-effect/color-adjuster.h>
 #include <dali-toolkit/internal/controls/bubble-effect/bubble-actor.h>
 #include <dali-toolkit/internal/controls/bubble-effect/color-adjuster.h>
 #include <dali-toolkit/internal/controls/bubble-effect/bubble-effect.h>
Domain: Graphics System / DALi;