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/utc-Dali-Internal-Mesh.cpp
automated-tests/src/dali/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali/utc-Dali-MeshActor.cpp
automated-tests/src/dali/utc-Dali-MeshData.cpp
dali/devel-api/actors/mesh-actor.cpp
dali/devel-api/actors/mesh-actor.h
dali/devel-api/dynamics/dynamics-shape.h
dali/devel-api/geometry/animatable-mesh.cpp
dali/devel-api/geometry/animatable-mesh.h
dali/devel-api/geometry/animatable-vertex.cpp
dali/devel-api/geometry/animatable-vertex.h
dali/devel-api/geometry/cloth.cpp
dali/devel-api/geometry/cloth.h
dali/devel-api/geometry/mesh-data.cpp
dali/devel-api/geometry/mesh-data.h
dali/devel-api/geometry/mesh-factory.cpp
dali/devel-api/geometry/mesh-factory.h
dali/devel-api/geometry/mesh.cpp
dali/devel-api/geometry/mesh.h
dali/devel-api/modeling/bone.cpp
dali/devel-api/modeling/bone.h
dali/devel-api/modeling/material.cpp
dali/devel-api/modeling/material.h
dali/integration-api/dynamics/dynamics-body-intf.h
dali/integration-api/dynamics/dynamics-shape-intf.h
dali/internal/event/actor-attachments/mesh-attachment-impl.h
dali/internal/event/actors/mesh-actor-impl.h
dali/internal/event/modeling/animatable-mesh-impl.h
dali/internal/event/modeling/cloth-impl.h
dali/internal/event/modeling/material-impl.h
dali/internal/event/modeling/mesh-impl.cpp
dali/internal/event/modeling/mesh-impl.h
dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp
dali/internal/update/modeling/internal-mesh-data.h
dali/internal/update/node-attachments/scene-graph-mesh-attachment.h
dali/internal/update/resources/resource-manager.cpp
dali/public-api/actors/renderable-actor.cpp
dali/public-api/actors/renderable-actor.h
dali/public-api/dali-core.h
dali/public-api/file.list

Change-Id: I43f0cad38d302fde14bde4288825d6f15443d43c

author	Francisco Santos <f1.santos@samsung.com>
	Mon, 18 May 2015 16:19:43 +0000 (17:19 +0100)
committer	Francisco Santos <f1.santos@samsung.com>
	Mon, 18 May 2015 16:19:43 +0000 (17:19 +0100)
commit	432923e17cb38a99fc012473ef97fa8c4fc36162
tree	267acd56f1361d76b588aa9962e6df65f98d46c2	tree \| snapshot
parent	4e95de703aecc7d1527302fac52076adec717b97	commit \| diff
parent	ec504b1da39973d10fc6374d8ce7384e7b9fa0ef	commit \| diff

automated-tests/src/dali/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/dali-test-suite-utils/test-dynamics.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/dali-test-suite-utils/test-dynamics.h	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali/utc-Dali-DynamicsShape.cpp	diff1 \|	diff2 \|	blob \| history
build/tizen/dali-core/Makefile.am	diff1 \|	diff2 \|	blob \| history
dali/devel-api/dynamics/dynamics-shape.cpp	diff1 \|	diff2 \|	blob \| history
dali/devel-api/file.list	\|	diff2 \|	blob \| history
dali/devel-api/geometry/cloth.cpp	\|	diff2 \|	blob \| history
dali/devel-api/geometry/cloth.h	\|	diff2 \|	blob \| history
dali/integration-api/dynamics/dynamics-body-intf.h	diff1 \|	diff2 \|	blob \| history
dali/integration-api/dynamics/dynamics-shape-intf.h	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/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/common/type-info-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/dynamics/dynamics-body-config-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/effects/shader-effect-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/event/modeling/cloth-impl.cpp	\|	diff2 \|	blob \| history
dali/internal/event/modeling/cloth-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/shaders/scene-graph-shader.cpp	diff1 \|	diff2 \|	blob \| history
dali/internal/update/common/uniform-map.h	diff1 \|	\|	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.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/dali-core.h	diff1 \|	diff2 \|	blob \| history
dali/public-api/file.list	diff1 \|	diff2 \|	blob \| history