[Merge] lp:~phablet-team/qt-halide/fix-live-updates into lp:qt-halide

Florian Boucault florian.boucault at canonical.com
Wed Apr 1 10:21:27 UTC 2015


Attempt to merge into lp:qt-halide failed due to conflicts: 

text conflict in tests/unit/tst_transform.qml
-- 
https://code.launchpad.net/~phablet-team/qt-halide/fix-live-updates/+merge/254067
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/qt-halide/unit-tests.



More information about the Ubuntu-reviews mailing list