Merge lp://qastaging/~alan-griffiths/compiz-core/private_screen-XExtensions into lp://qastaging/compiz-core
Proposed by
Alan Griffiths
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~alan-griffiths/compiz-core/private_screen-XExtensions |
| Merge into: | lp://qastaging/compiz-core |
| Diff against target: |
1005 lines (+194/-130) 6 files modified
include/core/screen.h (+1/-0) include/core/window.h (+2/-0) src/event.cpp (+25/-25) src/privatescreen.h (+78/-20) src/screen.cpp (+85/-82) src/window.cpp (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/compiz-core/private_screen-XExtensions |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Needs Resubmitting | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-03-30.
Description of the change
Factoring out more of PrivateScreen
To post a comment you must log in.
Unmerged revisions
- 3082. By Alan Griffiths
-
merge trunk changes
- 3081. By Alan Griffiths
-
merge
- 3080. By Alan Griffiths
-
merge
- 3079. By Alan Griffiths
-
merge
- 3078. By Alan Griffiths
-
merge
- 3077. By Alan Griffiths
-
merge
- 3076. By Alan Griffiths
-
Revert accidental formatting change
- 3075. By Alan Griffiths
-
Avoid merge conflict with lp:~alan-griffiths/compiz-core/private_screen-OutputDevices
- 3074. By Alan Griffiths
-
Avoid merge conflict with lp:~alan-griffiths/compiz-core/private_screen-OutputDevices
- 3073. By Alan Griffiths
-
Avoid merge conflict with lp:~alan-griffiths/compiz-core/private_screen-OutputDevices
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
It doesn't look like an ABI change. But I think we need to defer non-essential merges until the new development branch is created in the coming weeks.