projects / platform / core / uifw / dali-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca5caa5 c72d83a)
Merge branch 'tizen' of platform/core/uifw/dali-core into devel/new_mesh 47/37547/6
authorDavid Steele <david.steele@partner.samsung.com>
Mon, 30 Mar 2015 17:30:27 +0000 (18:30 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 16:03:00 +0000 (17:03 +0100)
commitb2b474f488d2bcb9f688a5106f578d141bbb8ddd
treeff40f382f3cc321b274420ab56425792f1b7f284tree | snapshot
parentca5caa540f1927afe1bbdc40587c0ee62bda158bcommit | diff
parentc72d83ab9ed29f43e69aa6959a2248e63bd1bcf8commit | diff
Merge branch 'tizen' of platform/core/uifw/dali-core into devel/new_mesh

Change-Id: I62e3e11ecb6d0019ead84574c5228c8abbd07287
59 files changed:
dali/internal/common/core-impl.h diff1 | diff2 | blob | history
dali/internal/event/actor-attachments/image-attachment-impl.cpp diff1 | diff2 | blob | history
dali/internal/event/actor-attachments/image-attachment-impl.h diff1 | diff2 | blob | history
dali/internal/event/actor-attachments/renderable-attachment-impl.cpp diff1 | diff2 | blob | history
dali/internal/event/actor-attachments/renderable-attachment-impl.h diff1 | diff2 | blob | history
dali/internal/event/actor-attachments/renderer-attachment-impl.cpp diff1 | | blob | history
dali/internal/event/actor-attachments/renderer-attachment-impl.h diff1 | | 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/renderer-impl.cpp diff1 | | blob | history
dali/internal/event/actors/renderer-impl.h diff1 | | blob | history
dali/internal/event/common/object-impl-helper.h diff1 | | blob | history
dali/internal/event/common/property-buffer-impl.cpp diff1 | | blob | history
dali/internal/event/common/property-buffer-impl.h diff1 | | blob | history
dali/internal/event/common/type-info-impl.cpp diff1 | diff2 | blob | history
dali/internal/event/effects/material-impl.cpp diff1 | | blob | history
dali/internal/event/effects/material-impl.h diff1 | | blob | history
dali/internal/event/effects/sampler-impl.cpp diff1 | | blob | history
dali/internal/event/effects/sampler-impl.h diff1 | | blob | history
dali/internal/event/effects/shader-effect-impl.cpp diff1 | diff2 | blob | history
dali/internal/event/effects/shader-effect-impl.h diff1 | diff2 | blob | history
dali/internal/event/effects/shader-impl.cpp diff1 | | blob | history
dali/internal/event/effects/shader-impl.h diff1 | | blob | history
dali/internal/event/geometry/geometry-impl.cpp diff1 | | blob | history
dali/internal/event/geometry/geometry-impl.h diff1 | | 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/renderers/scene-graph-image-renderer.cpp diff1 | diff2 | blob | history
dali/internal/render/renderers/scene-graph-text-renderer.cpp diff1 | diff2 | blob | history
dali/internal/render/shaders/program.cpp diff1 | diff2 | blob | history
dali/internal/render/shaders/scene-graph-shader.cpp diff1 | diff2 | blob | history
dali/internal/render/shaders/scene-graph-shader.h diff1 | diff2 | blob | history
dali/internal/update/dynamics/scene-graph-dynamics-body.cpp diff1 | diff2 | blob | history
dali/internal/update/effects/scene-graph-material.h diff1 | | blob | history
dali/internal/update/effects/scene-graph-sampler.h diff1 | | blob | history
dali/internal/update/geometry/scene-graph-geometry.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/manager/update-manager.h diff1 | diff2 | blob | history
dali/internal/update/node-attachments/scene-graph-image-attachment.h diff1 | diff2 | blob | history
dali/internal/update/node-attachments/scene-graph-renderable-attachment.h diff1 | diff2 | blob | history
dali/internal/update/node-attachments/scene-graph-renderer-attachment.h diff1 | | blob | history
dali/internal/update/nodes/node.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.h diff1 | diff2 | blob | history
dali/public-api/actors/renderer.h diff1 | | blob | history
dali/public-api/dali-core.h diff1 | diff2 | blob | history
dali/public-api/file.list diff1 | diff2 | blob | history
dali/public-api/geometry/geometry.h diff1 | | blob | history
dali/public-api/object/property-buffer.h diff1 | | blob | history
dali/public-api/shader-effects/material.h diff1 | | blob | history
dali/public-api/shader-effects/sampler.h diff1 | | blob | history
dali/public-api/shader-effects/shader.h diff1 | | blob | history
Domain: Graphics System / DALi;