Nux

Merge lp://qastaging/~bregma/nux/lp-1379960 into lp://qastaging/nux

  1. lp-1379960
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 859
Merged at revision: 862
Proposed branch: lp://qastaging/~bregma/nux/lp-1379960
Merge into: lp://qastaging/nux
Diff against target: 34 lines (+3/-3)
2 files modified
NuxGraphics/GraphicsDisplayX11.cpp (+2/-2)
NuxGraphics/GraphicsDisplayX11.h (+1/-1)
To merge this branch: bzr merge lp://qastaging/~bregma/nux/lp-1379960
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+260004@code.qastaging.launchpad.net

Commit message

fix the size of timeout values on 64-bit platforms (thanks Simon Arlott)

Description of the change

Fixes the size of timeout values on 64-bit platforms.

THIS IS AN ABI-BREAKING CHANGE.

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

PASSED: Continuous integration, rev:859
http://jenkins.qa.ubuntu.com/job/nux-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/119/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep, good sleuthing by Simon! Too bad this is an ABI break as it will make SRUing into Trusty quite difficult:(

review: Approve

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