Merge remote-tracking branch 'origin/tizen' into new_text 78/34378/1
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 26 Jan 2015 09:34:38 +0000 (09:34 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Mon, 26 Jan 2015 09:37:02 +0000 (09:37 +0000)
commitcb64d707bb95474fe193654b1325575b311af254
tree680693f38b086b4de3721afcc16a3583576e14b0
parentf1c2367c98129df016c4128bf705fc0986378f19
parentda4e08b7372a928c6f4c358f4acd5518d2e4d04d
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
demo/dali-table-view.cpp

Change-Id: Ib0075b320a16327e57d7eb2375082c8c4102f8a3
build/tizen/examples/Makefile.am
demo/dali-table-view.cpp
examples/scroll-view/scroll-view-example.cpp