Merge remote-tracking branch 'origin/tizen' into new_text 11/37211/2
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 20 Mar 2015 17:04:31 +0000 (17:04 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 20 Mar 2015 17:21:18 +0000 (17:21 +0000)
commit3e17d9f63dedb5d669409301f8d9a3d8c393f979
treecde143865834ead2982019badd296f4983e7a142
parent428bd47c26043ccaabab1a64cbc7cbd7ce3c7427
parent070dc0823710d9776fb368151f0a9e4d82bdf158
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/configure.ac

Change-Id: Id18adef88fdd0edca9ccb6a1225ab4def1bedf32
15 files changed:
build/tizen/configure.ac
packaging/dali-toolkit.spec
plugins/dali-script-v8/file.list
plugins/dali-script-v8/src/actors/actor-api.cpp
plugins/dali-script-v8/src/actors/actor-api.h
plugins/dali-script-v8/src/actors/actor-wrapper.cpp
plugins/dali-script-v8/src/actors/actor-wrapper.h
plugins/dali-script-v8/src/actors/text-actor-api.cpp
plugins/dali-script-v8/src/dali-wrapper.cpp
plugins/dali-script-v8/src/shader-effects/shader-effect-api.cpp
plugins/dali-script-v8/src/text/font-api.cpp
plugins/dali-script-v8/src/text/font-api.h
plugins/dali-script-v8/src/text/font-wrapper.cpp
plugins/dali-script-v8/src/text/font-wrapper.h
plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp