Merge lp://qastaging/~compiz-team/compiz-grid-plugin/oneiric.fix_834585 into lp://qastaging/compiz-grid-plugin
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz-grid-plugin/oneiric.fix_834585 |
| Merge into: | lp://qastaging/compiz-grid-plugin |
| Diff against target: |
771 lines (+324/-80) (has conflicts) 4 files modified
CMakeLists.txt (+2/-0) grid.xml.in (+14/-14) src/grid.cpp (+274/-52) src/grid.h (+34/-14) Text conflict in src/grid.cpp Text conflict in src/grid.h |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz-grid-plugin/oneiric.fix_834585 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2011-10-05.
Description of the change
Fix bug 834585
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
