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>
	Fri, 20 Mar 2015 16:36:41 +0000 (16:36 +0000)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Fri, 20 Mar 2015 16:41:35 +0000 (16:41 +0000)
commit	73c37a734c864d1098c86a44a064c9f35a2ed15d
tree	24a928b69479d38541e76bffe6bfc23e255f3ad3	tree \| snapshot
parent	ce9d6ea30f5c84093fabc43bc2af53b669028a4a	commit \| diff
parent	3bcb54791a6777e77f02612a1f7916e83ef1c86f	commit \| diff

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

Conflicts:
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/images/emoji-factory.cpp
dali/internal/event/resources/resource-client.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.h
dali/internal/update/resources/resource-manager.h

Change-Id: Ib4d3ac7babb73290aa6faf67a5695eed2ea6b6e7

Domain: Graphics System / DALi;

RSS Atom

dali/internal/common/core-impl.cpp	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/effects/shader-effect-impl.cpp	diff1 \|	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/shaders/shader.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.h	diff1 \|	diff2 \|	blob \| history