Merge remote-tracking branch 'origin/tizen' into new_text 61/36461/2 new_text_0.1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 6 Mar 2015 15:16:15 +0000 (15:16 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 6 Mar 2015 15:30:38 +0000 (15:30 +0000)
commita8bce60949a5a87984e0a4784c0e5bbd61764344
tree75ca347c7a2d0e8a8e42804fb2f7c6f1dffa0baf
parent9709e1327f6ca9391863eb6dacf562334a5d6a23
parente6e4b4c76cd1716668b8f06f3b7f1162c550f09a
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/utc-Dali-TextActor.cpp
dali/integration-api/platform-abstraction.h
dali/internal/event/actors/text-actor-impl.cpp
dali/public-api/actors/text-actor.h
dali/public-api/shader-effects/shader-effect.h

Change-Id: Ie11e1650979d994dc66975c65c55d88ca05570ee
15 files changed:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
automated-tests/src/dali/utc-Dali-ImageActor.cpp
automated-tests/src/dali/utc-Dali-Layer.cpp
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
dali/integration-api/platform-abstraction.h
dali/internal/event/effects/shader-effect-impl.cpp
dali/internal/event/effects/shader-factory.cpp
dali/internal/file.list
dali/internal/update/resources/resource-manager.cpp
dali/public-api/dali-core.h
dali/public-api/file.list
dali/public-api/shader-effects/shader-effect.h