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)
Change-Id: Ica8aad6d34fbebf441eb859fb716935aeaf0105f

1  2 
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

Simple merge
Simple merge
Simple merge