Merge remote-tracking branch 'origin/tizen' into new_text 10/38010/1
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:21:16 +0000 (13:21 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 12:22:40 +0000 (13:22 +0100)
commitd04c5bdbb95cc98f90848c7a98b0b2804df6e5b8
treed36df8e0e0e379427aec792c55576c07a489174c
parentf5b98922d42457ef4e33c05dc1fb612fa24e888f
parent56c2c6b9998a38276bd619ef7ca4e20522cf0da8
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Iba714851799e17a461ac18d8431204835675c67b
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/public-api/controls/control-impl.cpp