Merge remote-tracking branch 'origin/tizen' into new_text 12/38012/1
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:23:19 +0000 (13:23 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:23:40 +0000 (13:23 +0100)
commitd6045205a5493e9d1509fa286cf9bc588e3529ac
tree5225eb78919a3b97fafde42945e8d157acb522c0
parent6643fc70143e6d9b9cfcceafdcf109a1d00da33a
parentf6dac5b48f3df4b1c767174606b743e8b7720db1
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Ica8aad6d34fbebf441eb859fb716935aeaf0105f
demo/dali-table-view.cpp
examples/blocks/blocks-example.cpp
examples/cluster/cluster-example.cpp
examples/magnifier/magnifier-example.cpp
examples/refraction-effect/refraction-effect-example.cpp
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp