[Merge] lp:~albaguirre/qtubuntu/more-new-mir-apis into lp:qtubuntu
Daniel d'Andrada
daniel.dandrada at canonical.com
Tue Feb 21 15:15:56 UTC 2017
Review: Needs Fixing
We should be able to merge it now that the fix for bug 1663197 has been released. Unfortunately this branch now conflicts with latest trunk.
"""
$ bzr merge lp:~albaguirre/qtubuntu/more-new-mir-apis
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.63+17.04.20170119.2.
M src/ubuntumirclient/qmirclientcursor.cpp
M src/ubuntumirclient/qmirclientdebugextension.cpp
M src/ubuntumirclient/qmirclientdebugextension.h
M src/ubuntumirclient/qmirclientintegration.cpp
M src/ubuntumirclient/qmirclientwindow.cpp
Text conflict in src/ubuntumirclient/qmirclientcursor.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.h
Text conflict in src/ubuntumirclient/qmirclientwindow.cpp
4 conflicts encountered.
"""
--
https://code.launchpad.net/~albaguirre/qtubuntu/more-new-mir-apis/+merge/316646
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.
More information about the Ubuntu-reviews
mailing list