Merge lp://qastaging/~smspillaz/compiz-grid-plugin/oneiric.maybe_fix_corruption_placement into lp://qastaging/compiz-grid-plugin

Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~smspillaz/compiz-grid-plugin/oneiric.maybe_fix_corruption_placement
Merge into: lp://qastaging/compiz-grid-plugin
Diff against target: 739 lines (+313/-72) (has conflicts)
4 files modified
CMakeLists.txt (+2/-0)
grid.xml.in (+14/-14)
src/grid.cpp (+263/-44)
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/~smspillaz/compiz-grid-plugin/oneiric.maybe_fix_corruption_placement
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+77848@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2011-10-03.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches