projects / platform / core / uifw / dali-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd5e9d9 0627601)
Merge branch devel/master (1.0.49) into tizen 49/46349/1
authortaeyoon <taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 07:14:29 +0000 (16:14 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 12:26:57 +0000 (21:26 +0900)
commit111e4590a7f0b90fbf9683e29d6d39d9da15ef60
treefc32b0cbb497f1932b89bd9b469811ae54709375tree | snapshot
parentfd5e9d953704e4821ffff59473a9fc1317ca35e8commit | diff
parent06276017856a9ac4744edd05601cf2d32062d3fbcommit | diff
Merge branch devel/master (1.0.49) into tizen

Conflicts:
automated-tests/src/dali-devel/CMakeLists.txt
automated-tests/src/dali-devel/mesh-builder.cpp
automated-tests/src/dali-devel/mesh-builder.h
automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp
automated-tests/src/dali-devel/utc-Dali-Material.cpp
automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp
automated-tests/src/dali-devel/utc-Dali-MeshData.cpp
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/utc-Dali-PropertyValue.cpp
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
build/tizen/configure.ac
build/tizen/dali-core/Makefile.am
dali/devel-api/dynamics/dynamics-body-config.cpp
dali/devel-api/dynamics/dynamics-body.cpp
dali/devel-api/dynamics/dynamics-collision.cpp
dali/devel-api/dynamics/dynamics-joint.cpp
dali/devel-api/dynamics/dynamics-shape.cpp
dali/devel-api/dynamics/dynamics-world-config.cpp
dali/devel-api/dynamics/dynamics-world.cpp
dali/devel-api/scripting/scripting.cpp
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/actors/actor-impl.h
dali/internal/event/common/property-helper.h
dali/internal/event/common/thread-local-storage.cpp
dali/internal/event/common/thread-local-storage.h
dali/internal/event/effects/shader-effect-impl.cpp
dali/internal/update/manager/update-manager.cpp
dali/internal/update/manager/update-manager.h
dali/internal/update/modeling/scene-graph-animatable-mesh.cpp
dali/internal/update/resources/resource-manager.cpp
dali/public-api/dali-core-version.cpp
dali/public-api/object/property-value.cpp
dali/public-api/object/property-value.h
packaging/dali.spec

Change-Id: I286687a5ab36da06eefa9ad6ac60743e1257e59f
Domain: Graphics System / DALi;