Merge lp://qastaging/~amaranth/gnome-panel/scroll_with_viewports into lp://qastaging/~ubuntu-desktop/gnome-panel/ubuntu

Proposed by Travis Watkins
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp://qastaging/~amaranth/gnome-panel/scroll_with_viewports
Merge into: lp://qastaging/~ubuntu-desktop/gnome-panel/ubuntu
Diff against target: 242 lines (+211/-0) (has conflicts)
3 files modified
debian/changelog (+12/-0)
debian/patches/29_make_scrolling_work_with_viewports.patch (+192/-0)
debian/patches/series (+7/-0)
Text conflict in debian/changelog
Text conflict in debian/patches/series
To merge this branch: bzr merge lp://qastaging/~amaranth/gnome-panel/scroll_with_viewports
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Michael Vogt Pending
Review via email: mp+10803@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, that merge request has conflicts though and would need to be updated, setting to needs fixing so it gets out of the reviews list

review: Needs Fixing

Unmerged revisions

22. By Travis Watkins

* debian/patches/29_make_scrolling_work_with_viewports.patch:
  - change workspace switcher applet to change viewports with
    the mousewhell just like with virual desktops

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

to all changes: