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

projects / platform / core / uifw / dali-core.git / commit

author	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 25 Feb 2015 11:46:17 +0000 (11:46 +0000)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 25 Feb 2015 12:33:58 +0000 (12:33 +0000)
commit	5787f865cbe64c2b89e85852e3230dac1fdef6b1
tree	6e058ab701949cf62e2899d50a93e9a1dcbd79e2	tree \| snapshot
parent	d7d135489b9892e2275423ced40596cd7d30aa31	commit \| diff
parent	3b40105fa98689b9356125ffa3da85c85d07bc71	commit \| diff

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali/CMakeLists.txt
dali/internal/event/actor-attachments/text-attachment-impl.cpp
dali/internal/event/actor-attachments/text-attachment-impl.h
dali/internal/event/actors/text-actor-impl.cpp
dali/internal/event/actors/text-actor-impl.h
dali/internal/event/resources/resource-client.h
dali/internal/file.list
dali/public-api/actors/text-actor.cpp
dali/public-api/actors/text-actor.h
dali/public-api/file.list
dali/public-api/images/glyph-image.cpp
dali/public-api/text/utf8.cpp
dali/public-api/text/utf8.h

Change-Id: I89538a2c16c233457abfd2445de9de57ac7c1742

29 files changed:

automated-tests/src/dali/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-ImageActor.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-Scripting.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-TypeRegistry.cpp	diff1 \|	diff2 \|	blob \| history
dali/integration-api/resource-types.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/thread-local-storage.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/thread-local-storage.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/images/bitmap-image-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/images/resource-image-impl.h	\|	diff2 \|	blob \| history
dali/internal/event/resources/resource-client.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/resources/resource-client.h	diff1 \|	diff2 \|	blob \| history
dali/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali/internal/render/common/texture-cache-dispatcher.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/bitmap-texture.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/bitmap-texture.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/compressed-bitmap-texture.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/texture-cache.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/texture-cache.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/shaders/shader.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-algorithms.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history
dali/public-api/scripting/scripting.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/shader-effects/shader-effect.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/shader-effects/shader-effect.h	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / DALi;

RSS Atom

automated-tests/src/dali/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-ImageActor.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-Scripting.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-TypeRegistry.cpp	diff1 \|	diff2 \|	blob \| history
dali/integration-api/resource-types.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/thread-local-storage.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/thread-local-storage.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/images/bitmap-image-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/images/resource-image-impl.h	\|	diff2 \|	blob \| history
dali/internal/event/resources/resource-client.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/resources/resource-client.h	diff1 \|	diff2 \|	blob \| history
dali/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali/internal/render/common/texture-cache-dispatcher.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/bitmap-texture.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/bitmap-texture.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/compressed-bitmap-texture.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/texture-cache.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/render/gl-resources/texture-cache.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/shaders/shader.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-algorithms.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history
dali/public-api/scripting/scripting.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/shader-effects/shader-effect.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/shader-effects/shader-effect.h	diff1 \|	diff2 \|	blob \| history