From: taeyoon <taeyoon0.lee@samsung.com>
Date: Wed, 19 Aug 2015 08:15:33 +0000 (+0900)
Subject: Merge branch devel/master(1.0.49) into tizen
X-Git-Tag: accepted/tizen/mobile/20150820.115740^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F46365%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch devel/master(1.0.49) into tizen

Conflicts:
	automated-tests/src/dali-toolkit-internal/CMakeLists.txt
	automated-tests/src/dali-toolkit/CMakeLists.txt
	automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
	build/tizen/dali-toolkit/Makefile.am
	dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
	dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.cpp
	dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
	dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp
	dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
	dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
	dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
	dali-toolkit/internal/atlas-manager/atlas-manager.cpp
	dali-toolkit/internal/atlas-manager/atlas-manager.h
	dali-toolkit/internal/builder/builder-set-property.cpp
	dali-toolkit/internal/controls/table-view/table-view-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.h
	dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-label-impl.h
	dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
	dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
	dali-toolkit/internal/text/decorator/text-decorator.cpp
	dali-toolkit/internal/text/decorator/text-decorator.h
	dali-toolkit/internal/text/layouts/layout-engine.cpp
	dali-toolkit/internal/text/multi-language-support-impl.cpp
	dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
	dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
	dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
	dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
	dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
	dali-toolkit/internal/text/text-control-interface.h
	dali-toolkit/internal/text/text-controller-impl.cpp
	dali-toolkit/internal/text/text-controller-impl.h
	dali-toolkit/internal/text/text-controller.cpp
	dali-toolkit/internal/text/text-controller.h
	dali-toolkit/internal/text/text-view.cpp
	dali-toolkit/internal/text/visual-model-impl.cpp
	dali-toolkit/internal/text/visual-model-impl.h
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/dali-toolkit-version.cpp
	dali-toolkit/styles/dali-toolkit-default-theme.json
	dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
	packaging/dali-toolkit.spec

Change-Id: I5d59b3507a65e5806bdc804d793fc872772de097
---

8ab5e358c03e5b8547b6b78ff70e5a769e02a6eb