← Back to branch summary

~gerboland/qtubuntu/enable-debug-mode

~gerboland/qtubuntu/enable-debug-mode

Viewing all changes in revision 288.

Committer: Gerry Boland
Date: 2016-06-24 12:11:21 UTC
mfrom: (280.28.15 qtubuntu)
Revision ID: gerry.boland@canonical.com-20160624121121-086s2yy603hfsuus

Merge trunk & fix conflicts

files added:
debian/bileto_convert_to_gles

debian/gles-patches

debian/gles-patches/convert-to-gles.patch

debian/gles-patches/series

src/ubuntumirclient/screenobserver.cpp

src/ubuntumirclient/screenobserver.h

files modified:
debian/changelog

debian/control

debian/rules

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/glcontext.h

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/nativeinterface.h

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

debian/bileto_convert_to_gles

debian/changelog

debian/gles-patches/

debian/gles-patches/convert-to-gles.patch

debian/gles-patches/series

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/glcontext.h

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/nativeinterface.h

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/screenobserver.cpp

src/ubuntumirclient/screenobserver.h

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Older »