qmenumodel

Merge lp://staging/~marcustomlinson/qmenumodel/fix_define_guard into lp://staging/~phablet-team/qmenumodel/trunk

  1. fix_define_guard
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Superseded
Proposed branch: lp://staging/~marcustomlinson/qmenumodel/fix_define_guard
Merge into: lp://staging/~phablet-team/qmenumodel/trunk
Diff against target: 21 lines (+2/-1)
2 files modified
.bzrignore (+1/-0)
libqmenumodel/src/menunode.h (+1/-1)
To merge this branch: bzr merge lp://staging/~marcustomlinson/qmenumodel/fix_define_guard
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+194127@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-11-20.

Commit message

Fixed #define guard

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qmenumodel-ci/39/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Good catch, thanks.

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches