[Merge] lp:~artmello/qtubuntu/qtubuntu-new_mir_api into lp:qtubuntu

[Lukáš Tinkl]

Review: Needs Fixing

Can you please merge your parent?

Text conflict in src/ubuntumirclient/qmirclientcursor.cpp
Text conflict in src/ubuntumirclient/qmirclientcursor.h
Text conflict in src/ubuntumirclient/qmirclientdebugextension.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.h
Text conflict in src/ubuntumirclient/qmirclientinput.cpp
Text conflict in src/ubuntumirclient/qmirclientinput.h
Text conflict in src/ubuntumirclient/qmirclientnativeinterface.cpp
Text conflict in src/ubuntumirclient/qmirclientnativeinterface.h
Text conflict in src/ubuntumirclient/qmirclientwindow.cpp
Text conflict in src/ubuntumirclient/qmirclientwindow.h
10 conflicts encountered.

2017-02-08 15:54:48,633 ERROR zesty/qtubuntu: Failed to merge https://code.launchpad.net/~artmello/qtubuntu/qtubuntu-new_mir_api
-- 
https://code.launchpad.net/~artmello/qtubuntu/qtubuntu-new_mir_api/+merge/316577
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.