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

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

Conflicts:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
dali/integration-api/profiling.cpp
dali/integration-api/resource-types.h
dali/internal/event/actor-attachments/actor-attachment-declarations.h
dali/internal/event/actors/actor-declarations.h
dali/internal/event/actors/actor-impl.h
dali/internal/event/common/object-impl.cpp
dali/internal/event/dynamics/dynamics-mesh-shape-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/event/resources/resource-client.cpp
dali/internal/event/resources/resource-client.h
dali/internal/event/resources/resource-type-path.cpp
dali/internal/file.list
dali/internal/render/renderers/scene-graph-text-renderer.cpp
dali/internal/render/renderers/scene-graph-text-renderer.h
dali/internal/render/shaders/program.cpp
dali/internal/render/shaders/program.h
dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.h
dali/internal/update/manager/update-algorithms.cpp
dali/internal/update/manager/update-manager.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.cpp
dali/internal/update/node-attachments/scene-graph-text-attachment.h
dali/internal/update/resources/resource-manager.cpp
dali/internal/update/resources/resource-manager.h
dali/public-api/actors/actor.h
dali/public-api/actors/mesh-actor.cpp
dali/public-api/actors/mesh-actor.h
dali/public-api/dali-core.h
dali/public-api/file.list
dali/public-api/geometry/animatable-mesh.cpp
dali/public-api/geometry/animatable-mesh.h
dali/public-api/geometry/animatable-vertex.cpp
dali/public-api/geometry/animatable-vertex.h
dali/public-api/geometry/cloth.cpp
dali/public-api/geometry/cloth.h
dali/public-api/geometry/mesh-data.cpp
dali/public-api/geometry/mesh-data.h
dali/public-api/geometry/mesh-factory.cpp
dali/public-api/geometry/mesh-factory.h
dali/public-api/geometry/mesh.cpp
dali/public-api/geometry/mesh.h
dali/public-api/modeling/bone.cpp
dali/public-api/modeling/bone.h
dali/public-api/modeling/material.cpp
dali/public-api/modeling/material.h

Change-Id: Ibb8ab185f4e54f757d7de78be85ae6b537c7e7f4

author	Francisco Santos <f1.santos@samsung.com>
	Mon, 27 Apr 2015 14:46:05 +0000 (15:46 +0100)
committer	Francisco Santos <f1.santos@samsung.com>
	Tue, 28 Apr 2015 09:32:20 +0000 (10:32 +0100)
commit	e7267cff159c0ea2f919cbbe8c809f22226148d9
tree	a464fbebb40faee0a2c6a922fda09f036ca3a027	tree \| snapshot
parent	d0970a6699cdb70190f2b6e8fb77fa53361ec5d2	commit \| diff
parent	044afbb9fae2470477ee11d65c7c043eb45e6800	commit \| diff

automated-tests/src/dali-internal/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Internal-Handles.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp	diff1 \|	diff2 \|	blob \| history
dali/integration-api/profiling.cpp	diff1 \|	diff2 \|	blob \| history
dali/integration-api/resource-types.h	diff1 \|	diff2 \|	blob \| history
dali/internal/common/core-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actor-attachments/actor-attachment-declarations.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/actors/actor-declarations.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/image-actor-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/common/object-impl.h	diff1 \|	diff2 \|	blob \| history
dali/internal/event/common/property-metadata.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/event/resources/resource-type-path.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali/internal/render/shaders/program.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/render/shaders/program.h	diff1 \|	diff2 \|	blob \| history
dali/internal/render/shaders/scene-graph-shader.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/common/property-owner.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/common/uniform-map.h	diff1 \|	\|	blob \| history
dali/internal/update/dynamics/scene-graph-dynamics-body.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/object-owner-container.h	diff1 \|	\|	blob \| history
dali/internal/update/manager/update-algorithms.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/manager/update-manager.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/nodes/node.h	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/actors/actor.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/actor.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/image-actor.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/image-actor.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/renderable-actor.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/actors/renderable-actor.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/dynamics/dynamics-shape.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/dynamics/dynamics-shape.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history
dali/public-api/images/frame-buffer-image.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/object/handle.cpp	diff1 \|	diff2 \|	blob \| history
dali/public-api/object/handle.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/object/property-index-ranges.h	diff1 \|	diff2 \|	blob \| history