Mir

Merge lp:~alan-griffiths/mir/fix-1654023 into lp:mir

Proposed by Alan Griffiths on 2017-01-04
Status: Merged
Approved by: Daniel van Vugt on 2017-01-05
Approved revision: 3903
Merged at revision: 3904
Proposed branch: lp:~alan-griffiths/mir/fix-1654023
Merge into: lp:mir
Diff against target: 1 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1654023
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-01-05
Daniel van Vugt Approve on 2017-01-05
Brandon Schaefer (community) 2017-01-04 Approve on 2017-01-05
Review via email: mp+314103@code.launchpad.net

Commit message

Move mir_input_device_types.h from the (unpublished) include/common/mir_toolkit/ directory to where it /1/ gets published and /2/ can be accessed by the various public headers that use it.

Description of the change

Move mir_input_device_types.h from the (unpublished) include/common/mir_toolkit/ directory to where it /1/ gets published and /2/ can be accessed by the various public headers that use it.

I chose mircore-dev for this header over mirclient-dev as it is used by both mircommon headers and mirclient ones.

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3903
https://mir-jenkins.ubuntu.com/job/mir-ci/2519/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3280/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3347
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3339
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3339
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3339
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3309/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3309
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3309/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3309
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3309/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3309
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3309/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3309
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3309/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3309
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3309/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2519/rebuild

review: Needs Fixing (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

Seems fair to me (also 1 line diff, impressive!)

review: Approve
Daniel van Vugt (vanvugt) :
review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'include/common/mir_toolkit/mir_input_device_types.h' => 'include/core/mir_toolkit/mir_input_device_types.h'

Subscribers

People subscribed via source and target branches