Compiz Core

Merge lp://qastaging/~alan-griffiths/compiz-core/private_screen-History1 into lp://qastaging/compiz-core

  1. private_screen-History1
  2. Merge into 0.9.7
Proposed by Alan Griffiths
Status: Merged
Merged at revision: 3053
Proposed branch: lp://qastaging/~alan-griffiths/compiz-core/private_screen-History1
Merge into: lp://qastaging/compiz-core
Diff against target: 112 lines (+21/-10)
3 files modified
src/event.cpp (+5/-5)
src/privatescreen.h (+11/-1)
src/screen.cpp (+5/-4)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/compiz-core/private_screen-History1
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+96568@code.qastaging.launchpad.net

Description of the change

Decouple History from rest of what was PrivateScreen

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Conflicts with lp:~alan-griffiths/compiz-core/private_screen-GrabList

Please wait for that, and for my other grab-related work, to be merged before fixing the conflict and resubmitting.

review: Needs Resubmitting
lp://qastaging/~alan-griffiths/compiz-core/private_screen-History1 updated
3050. By Alan Griffiths

merge

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks OK, works OK.

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