Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 13 Nov 2017 16:46:42 +0000 (16:46 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 13 Nov 2017 16:46:42 +0000 (16:46 +0000)
commitbfdd8f3e6140979eea46e46f5e2793881f9f390d
tree66937da6f773a46348597c6c3b7e9a7614315159
parent060cb1615f4e64ecebb7ce5d52f55dd701247099
parentde0af41b3e29ecc860e6a551688585fa7e6882fa
Merge branch 'devel/master' into devel/vulkan

Change-Id: I3938e02d547f9dcc5011b0ca2025824cbbb1550b
25 files changed:
automated-tests/scripts/tcheadgen.sh
automated-tests/src/dali-internal/utc-Dali-Internal-Core.cpp
automated-tests/src/dali/utc-Dali-FrameBuffer.cpp
automated-tests/src/dali/utc-Dali-PropertyBuffer.cpp
automated-tests/src/dali/utc-Dali-PropertyValue.cpp
build/scripts/dali_env
build/tizen/configure.ac
build/tizen/dali-core/Makefile.am
dali/integration-api/debug.h
dali/internal/common/owner-pointer.h
dali/internal/event/actors/custom-actor-internal.cpp
dali/internal/event/actors/custom-actor-internal.h
dali/internal/event/animation/animation-playlist.h
dali/internal/event/common/complete-notification-interface.h
dali/internal/event/rendering/geometry-impl.cpp
dali/internal/event/rendering/texture-impl.h
dali/internal/event/size-negotiation/relayout-controller-impl.cpp
dali/internal/render/common/render-manager.h
dali/internal/update/manager/update-manager.cpp
dali/internal/update/queue/update-message-queue.cpp
dali/public-api/object/property-types.cpp
dali/public-api/object/property-types.h
dali/public-api/object/property-value.cpp
dali/public-api/object/property-value.h
dali/public-api/object/property.h