Merge " fix Klocwork warning of unintialized data members, unneeded assignment &...

author Kimmo Hoikka <kimmo.hoikka@samsung.com>

Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)
diff --cc optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 6 Nov 2014 11:36:24 +0000 (03:36 -0800)