Merge remote-tracking branch 'origin/tizen' into new_text 78/36778/2
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 10:25:35 +0000 (10:25 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Mar 2015 10:53:55 +0000 (10:53 +0000)
commitea4b4faed233c96b4da93062b9eeda3d8d96471d
tree53ffc0163840a6b399d8024b7656f2efea244785
parenta8bce60949a5a87984e0a4784c0e5bbd61764344
parenta82bd248afafc3517064a05f0a879ba122753abc
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
dali/internal/update/resources/resource-manager.h
dali/public-api/actors/text-actor.h
dali/public-api/scripting/scripting.h

Change-Id: I0c89909f20b40d72fe3718387eed1a87519c0822
15 files changed:
automated-tests/src/dali/utc-Dali-TypeRegistry.cpp
dali/internal/common/fixed-size-memory-pool.cpp
dali/internal/event/images/buffer-image-impl.h
dali/internal/event/resources/resource-client.cpp
dali/internal/event/resources/resource-client.h
dali/internal/file.list
dali/internal/render/common/texture-cache-dispatcher.h
dali/internal/render/gl-resources/texture-cache.cpp
dali/internal/render/gl-resources/texture-cache.h
dali/internal/render/shaders/program.cpp
dali/internal/update/resources/resource-manager.cpp
dali/internal/update/resources/resource-manager.h
dali/public-api/dali-core.h
dali/public-api/file.list
dali/public-api/shader-effects/shader-effect.h