Merge Handle & Constrainable 87/35787/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 24 Feb 2015 13:17:10 +0000 (13:17 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 24 Feb 2015 16:03:47 +0000 (16:03 +0000)
commit44ee0cc4fac620903fdf198867f645a2d5dbf075
treebfea14b7bd1aa5c971862a2d6aa108bb73e23bf9
parentbb1ebe64287de082ff40f43a2639a8251176edc4
Merge Handle & Constrainable

Change-Id: If27ef930044532021863a224199f4d37b92693e7
19 files changed:
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/utc-Dali-Constrainable.cpp [deleted file]
automated-tests/src/dali/utc-Dali-Handle.cpp
dali/internal/event/common/object-impl.cpp
dali/internal/event/common/object-impl.h
dali/public-api/actors/actor.cpp
dali/public-api/actors/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/object/constrainable.cpp [deleted file]
dali/public-api/object/constrainable.h [deleted file]
dali/public-api/object/handle.cpp
dali/public-api/object/handle.h
dali/public-api/render-tasks/render-task.cpp
dali/public-api/render-tasks/render-task.h
dali/public-api/shader-effects/shader-effect.cpp
dali/public-api/shader-effects/shader-effect.h