Merge "Fix Klocwork issues." into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Tue, 7 Jul 2015 09:32:52 +0000 (02:32 -0700)

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

Tue, 7 Jul 2015 09:32:53 +0000 (02:32 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 7 Jul 2015 09:32:52 +0000 (02:32 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 7 Jul 2015 09:32:53 +0000 (02:32 -0700)
diff --cc dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
Simple merge
diff --cc dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
Simple merge
diff --cc dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 7 Jul 2015 09:32:52 +0000 (02:32 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 7 Jul 2015 09:32:53 +0000 (02:32 -0700)
		1	2
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history