review.tizen.org Git - platform/core/uifw/dali-toolkit.git/commit

Merged with Tizen Branch ( builds )

Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.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-animations.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-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/view/view-impl.cpp
dali-toolkit/internal/controls/view/view-impl.h
dali-toolkit/internal/text/decorator/text-decorator.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/rendering/atlas/text-atlas-renderer.h
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h
dali-toolkit/internal/text/rendering/text-renderer.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/visual-model-impl.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/view/view.h
dali-toolkit/public-api/dali-toolkit-version.cpp
docs/content/programming-guide/size-negotiation.h
packaging/dali-toolkit.spec

Change-Id: Ia6caabe5e4dc83995a0f10cd68a3a6487a1b7dba
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

author	Richard Underhill <r.underhill@partner.samsung.com>
	Thu, 30 Apr 2015 12:40:38 +0000 (13:40 +0100)
committer	Francisco Santos <f1.santos@samsung.com>
	Thu, 30 Apr 2015 14:19:52 +0000 (15:19 +0100)
commit	5f6befa398f1c68fcc8edff409a086f54af4d5f9
tree	764f3cbe3b4f4206470864a85856df1c5111a28c	tree \| snapshot
parent	030e7c680a6eb0e8d87bfdb8ec359a0267ef7db2	commit \| diff

automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp		diff \| blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp		diff \| blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h		diff \| blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager.cpp		diff \| blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager.h		diff \| blob \| history
dali-toolkit/internal/builder/builder-animations.cpp		diff \| blob \| history
dali-toolkit/internal/builder/builder-impl.cpp		diff \| blob \| history
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h		diff \| blob \| history
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp		diff \| blob \| history
dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-project	[new file with mode: 0644]	blob
dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-workspace	[new file with mode: 0644]	blob
dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-project	[new file with mode: 0644]	blob
dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-workspace	[new file with mode: 0644]	blob
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp		diff \| blob \| history
dali-toolkit/internal/controls/text-controls/text-field-impl.h		diff \| blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp		diff \| blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.h		diff \| blob \| history
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp		diff \| blob \| history
dali-toolkit/internal/controls/view/view-impl.cpp	[new file with mode: 0644]	blob
dali-toolkit/internal/controls/view/view-impl.h	[new file with mode: 0644]	blob
dali-toolkit/internal/file.list		diff \| blob \| history
dali-toolkit/internal/text/decorator/text-decorator.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h		diff \| blob \| history
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h		diff \| blob \| history
dali-toolkit/internal/text/rendering/shaders/text-basic-shader.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/shaders/text-basic-shadow-shader.cpp	[deleted file]	blob \| history
dali-toolkit/internal/text/rendering/shaders/text-basic-shadow-shader.h	[deleted file]	blob \| history
dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp		diff \| blob \| history
dali-toolkit/internal/text/rendering/text-renderer.h		diff \| blob \| history
dali-toolkit/internal/text/text-controller-impl.cpp		diff \| blob \| history
dali-toolkit/internal/text/text-controller-impl.h		diff \| blob \| history
dali-toolkit/internal/text/text-controller.cpp		diff \| blob \| history
dali-toolkit/internal/text/text-controller.h		diff \| blob \| history
dali-toolkit/internal/text/visual-model-impl.cpp		diff \| blob \| history
dali-toolkit/public-api/controls/control-impl.cpp		diff \| blob \| history
dali-toolkit/public-api/controls/text-controls/text-field.h		diff \| blob \| history
dali-toolkit/public-api/controls/view/view.h	[new file with mode: 0644]	blob
dali-toolkit/public-api/dali-toolkit-version.cpp		diff \| blob \| history
dali-toolkit/public-api/file.list		diff \| blob \| history
dali-toolkit/public-api/shader-effects/motion-blur-effect.cpp		diff \| blob \| history
dali-toolkit/public-api/shader-effects/motion-blur-effect.h		diff \| blob \| history
dali-toolkit/public-api/shader-effects/motion-stretch-effect.cpp		diff \| blob \| history
dali-toolkit/public-api/shader-effects/motion-stretch-effect.h		diff \| blob \| history
docs/content/main-page.h		diff \| blob \| history
docs/content/programming-guide/constraints-intro.h	[deleted file]	blob \| history
docs/content/programming-guide/constraints.h	[new file with mode: 0644]	blob
docs/content/programming-guide/script-howto.h	[deleted file]	blob \| history
docs/content/programming-guide/script-overview.h		diff \| blob \| history
packaging/dali-toolkit.spec		diff \| blob \| history