Merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-terminal/0.6.2-4ubuntu1 into lp://qastaging/ubuntu/trusty/xfce4-terminal

Proposed by Jackson Doak
Status: Merged
Merge reported by: Logan Rosen
Merged at revision: not available
Proposed branch: lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-terminal/0.6.2-4ubuntu1
Merge into: lp://qastaging/ubuntu/trusty/xfce4-terminal
Diff against target: 4489 lines (+82/-4267)
12 files modified
.pc/applied-patches (+0/-2)
.pc/fix-encoding-menu.patch/terminal/terminal-encoding-action.c (+0/-437)
.pc/xubuntu_alternate-scroll.patch/terminal/terminal-preferences.c (+0/-1489)
.pc/xubuntu_alternate-scroll.patch/terminal/terminal-screen.c (+0/-2256)
debian/changelog (+21/-0)
debian/control (+2/-2)
debian/patches/01_fix-encoding-menu-creation.patch (+54/-0)
debian/patches/fix-encoding-menu.patch (+0/-51)
debian/patches/series (+1/-1)
terminal/terminal-encoding-action.c (+4/-3)
terminal/terminal-preferences.c (+0/-13)
terminal/terminal-screen.c (+0/-13)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-terminal/0.6.2-4ubuntu1
Reviewer Review Type Date Requested Status
Logan Rosen (community) Approve
Ubuntu branches Pending
Review via email: mp+197447@code.qastaging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Logan Rosen (logan) wrote :

Merged, thanks!

Revision history for this message
Logan Rosen (logan) :
review: Approve

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: