Merge remote-tracking branch 'origin/tizen' into new_text 41/37841/1
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 10:02:40 +0000 (11:02 +0100)
commit297b3e7049f05c62fa5f619d13ce1488e14f9233
tree7e7969ef72d152f15d0cb9a04452c1a84ad702ae
parent414d56393a1ac62e399f93a1f9a4c323be659c85
parent56ff3fb26add3b08660f9986868ec68e1d30ae64
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I08714ae8f982734b411033a121669a0d7cec98b1
automated-tests/src/dali/utc-Dali-Scripting.cpp
dali/internal/update/manager/update-algorithms.cpp