← Back to branch summary

~gerboland/qtubuntu/enable-debug-mode

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/ubuntumirclient.pro

  • 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/ubuntumirclient.pro
27
27
    platformservices.cpp \
28
28
    plugin.cpp \
29
29
    screen.cpp \
 
30
    screenobserver.cpp \
30
31
    theme.cpp \
31
32
    window.cpp
32
33
 
44
45
    orientationchangeevent_p.h \
45
46
    platformservices.h \
46
47
    plugin.h \
 
48
    screenobserver.h \
47
49
    screen.h \
48
50
    theme.h \
49
51
    window.h