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

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

author	Francisco Santos <f1.santos@samsung.com>
	Thu, 4 Jun 2015 16:12:13 +0000 (17:12 +0100)
committer	Francisco Santos <f1.santos@samsung.com>
	Tue, 9 Jun 2015 09:46:45 +0000 (10:46 +0100)
commit	a86ae47738c5baf9707e366912e1f52dbba39129
tree	3589cb7481fac72d24090eb394b54429e562d40f	tree \| snapshot
parent	e7e01e53658a0ec14c71af35ad4c00ce8a70a1b4	commit \| diff
parent	7f19da84b620db6697f2ff7e5dfcf4a17cbbc64f	commit \| diff

Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
automated-tests/src/dali-internal/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-internal/utc-Dali-MeshActor.cpp
automated-tests/src/dali-internal/utc-Dali-MeshData.cpp
automated-tests/src/dali/CMakeLists.txt.in
dali/internal/event/actors/layer-impl.h
dali/internal/event/common/type-info-impl.cpp
dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/file.list
dali/public-api/actors/layer.cpp
dali/public-api/actors/layer.h

Change-Id: Id8a451346a2b5c92276cd38bb63fde1e01036455

25 files changed:

automated-tests/src/dali-internal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Context.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Material.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/CMakeLists.txt.in	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-Layer.cpp	diff1 \|	diff2 \|	blob \| history
dali/devel-api/file.list	diff1 \|	diff2 \|	blob \| history
dali/integration-api/resource-types.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/image-actor-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/layer-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/object-impl-helper.h	diff1 \|	\|	blob \| history
dali/internal/event/common/object-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/effects/shader-effect-impl.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/update/node-attachments/scene-graph-image-attachment.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/actor.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/actor.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/layer.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/layer.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / DALi;

RSS Atom

automated-tests/src/dali-internal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Context.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Material.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/CMakeLists.txt.in	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-Layer.cpp	diff1 \|	diff2 \|	blob \| history
dali/devel-api/file.list	diff1 \|	diff2 \|	blob \| history
dali/integration-api/resource-types.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/image-actor-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/layer-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/object-impl-helper.h	diff1 \|	\|	blob \| history
dali/internal/event/common/object-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/effects/shader-effect-impl.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/update/node-attachments/scene-graph-image-attachment.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/resources/resource-manager.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/actor.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/actor.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/layer.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/layer.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history