Merge lp://qastaging/~compiz-team/compiz-core/compiz-core.fix_882531 into lp://qastaging/compiz-core/0.9.5
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz-core/compiz-core.fix_882531 |
| Merge into: | lp://qastaging/compiz-core/0.9.5 |
| Diff against target: |
106 lines (+38/-7) (has conflicts) 2 files modified
plugins/composite/include/composite/composite.h (+13/-7) plugins/composite/src/screen.cpp (+25/-0) Text conflict in plugins/composite/src/screen.cpp |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz-core/compiz-core.fix_882531 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Needs Fixing | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-01-30.
Description of the change
Adds a wrapable damageRegion function
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Merge errors in diff