From: Francisco Santos <f1.santos@samsung.com>
Date: Mon, 8 Jun 2015 09:56:13 +0000 (+0100)
Subject: Merge branch 'tizen' into devel/new_mesh
X-Git-Tag: dali_1.0.47~13^2~20^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1c5674a11a51310ee689d6daf4e6b7d94dec607e;hp=1c5674a11a51310ee689d6daf4e6b7d94dec607e;ds=sidebyside

Merge branch 'tizen' into devel/new_mesh

Conflicts:
	automated-tests/src/dali-toolkit/CMakeLists.txt
	automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
	automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-DisplacementEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
	automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-SoftButtonEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp
	automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
	build/tizen/dali-toolkit/Makefile.am
	dali-toolkit/dali-toolkit.h
	dali-toolkit/devel-api/shader-effects/alpha-discard-effect.cpp
	dali-toolkit/devel-api/shader-effects/bendy-effect.cpp
	dali-toolkit/devel-api/shader-effects/blind-effect.cpp
	dali-toolkit/devel-api/shader-effects/bouncing-effect.cpp
	dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.cpp
	dali-toolkit/devel-api/shader-effects/bubble-effect/bubble-effect.h
	dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.cpp
	dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h
	dali-toolkit/devel-api/shader-effects/carousel-effect.cpp
	dali-toolkit/devel-api/shader-effects/displacement-effect.cpp
	dali-toolkit/devel-api/shader-effects/dissolve-effect.cpp
	dali-toolkit/devel-api/shader-effects/dissolve-local-effect.cpp
	dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp
	dali-toolkit/devel-api/shader-effects/image-region-effect.cpp
	dali-toolkit/devel-api/shader-effects/iris-effect.cpp
	dali-toolkit/devel-api/shader-effects/mask-effect.cpp
	dali-toolkit/devel-api/shader-effects/mirror-effect.cpp
	dali-toolkit/devel-api/shader-effects/motion-blur-effect.cpp
	dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
	dali-toolkit/devel-api/shader-effects/nine-patch-mask-effect.cpp
	dali-toolkit/devel-api/shader-effects/overlay-effect.cpp
	dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.cpp
	dali-toolkit/devel-api/shader-effects/page-turn-book-spine-effect.h
	dali-toolkit/devel-api/shader-effects/page-turn-effect.cpp
	dali-toolkit/devel-api/shader-effects/page-turn-effect.h
	dali-toolkit/devel-api/shader-effects/quadratic-bezier.cpp
	dali-toolkit/devel-api/shader-effects/ripple-effect.cpp
	dali-toolkit/devel-api/shader-effects/ripple2d-effect.cpp
	dali-toolkit/devel-api/shader-effects/shear-effect.cpp
	dali-toolkit/devel-api/shader-effects/soft-button-effect.cpp
	dali-toolkit/devel-api/shader-effects/spot-effect.cpp
	dali-toolkit/devel-api/shader-effects/square-dissolve-effect.cpp
	dali-toolkit/devel-api/shader-effects/swirl-effect.cpp
	dali-toolkit/devel-api/shader-effects/water-effect.cpp
	dali-toolkit/devel-api/shader-effects/water-effect.h
	dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
	dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
	dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
	dali-toolkit/internal/controls/buttons/check-box-button-impl.h
	dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
	dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
	dali-toolkit/internal/shader-effects/page-turn-effect-impl.h
	dali-toolkit/internal/shader-effects/water-effect-impl.cpp
	dali-toolkit/internal/shader-effects/water-effect-impl.h
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/file.list
	dali-toolkit/public-api/shader-effects/bubble-effect/bubble-effect.h
	docs/content/programming-guide/shader-intro.h

Change-Id: I677eaa3e6a0558c360fc6b379a73fac18d0eb008
---