← Back to branch summary

~ci-train-bot/qtubuntu/qtubuntu-ubuntu-xenial-landing-057

~ci-train-bot/qtubuntu/qtubuntu-ubuntu-xenial-landing-057

Viewing all changes in revision 283.1.5.

Committer: Gerry Boland
Date: 2015-11-17 12:47:45 UTC
mfrom: (258.6.46 use-mir-surface-apis)
mto: This revision was merged to the branch mainline in revision 291.
Revision ID: gerry.boland@canonical.com-20151117124745-c4pqsn96pwl39c90

Rebase on use-mir-surface-apis and resolve conflicts

files modified:
debian/changelog

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

debian/changelog

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Older »