← Back to branch summary

~gerboland/qtubuntu/active-decision-refactor

~gerboland/qtubuntu/active-decision-refactor

Viewing all changes in revision 351.

Committer: Gerry Boland
Date: 2016-11-04 13:20:58 UTC
mfrom: (345.1.6 qtubuntu)
Revision ID: gerry.boland@canonical.com-20161104132058-x85zam3rmvsfus4e

Merge trunk and resolve conflicts

files added:
src/ubuntumirclient/debugextension.cpp

src/ubuntumirclient/debugextension.h

src/ubuntumirclient/desktopwindow.cpp

src/ubuntumirclient/desktopwindow.h

files modified:
debian/changelog

debian/control

src/ubuntumirclient/backingstore.cpp

src/ubuntumirclient/backingstore.h

src/ubuntumirclient/cursor.cpp

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/input.cpp

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/logging.h

src/ubuntumirclient/plugin.cpp

src/ubuntumirclient/plugin.h

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screenobserver.cpp

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/ubuntumirclient/backingstore.cpp

src/ubuntumirclient/backingstore.h

src/ubuntumirclient/cursor.cpp

src/ubuntumirclient/debugextension.cpp

src/ubuntumirclient/debugextension.h

src/ubuntumirclient/desktopwindow.cpp

src/ubuntumirclient/desktopwindow.h

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/input.cpp

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/logging.h

src/ubuntumirclient/plugin.cpp

src/ubuntumirclient/plugin.h

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screenobserver.cpp

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Older »