Merge remote-tracking branch 'origin/tizen' into new_text 57/33257/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:12:50 +0000 (10:12 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 7 Jan 2015 10:12:50 +0000 (10:12 +0000)
commit24b3e26d147f772b0396937442484ff75b327aa7
treebb4f7f69cb835a8d5e955288b425ad84895770ce
parent93fb6a1d3dc8872275bde30ef6a05407a67d694c
parent7f35cb5ac96b2360bba850dfa20d88bbc9f9a362
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView-Relayout-Utilities.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-TextView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextView.cpp

Change-Id: I03204cfe486d6b861d970676b9db41749c6236eb
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-NavigationControl.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
packaging/dali-toolkit.spec