Merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-terminal/0.6.3 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.3
Merge into: lp://qastaging/ubuntu/trusty/xfce4-terminal
Diff against target: 47538 lines (+11018/-23953)
85 files modified
.pc/01_fix-encoding-menu-creation.patch/terminal/terminal-encoding-action.c (+0/-437)
.pc/applied-patches (+0/-2)
.pc/xubuntu_alternate-scroll.patch/terminal/terminal-preferences.c (+0/-1489)
.pc/xubuntu_alternate-scroll.patch/terminal/terminal-screen.c (+0/-2256)
ChangeLog (+560/-0)
INSTALL (+1/-1)
Makefile.in (+59/-26)
NEWS (+26/-11)
aclocal.m4 (+204/-106)
colorschemes/Makefile.am (+1/-0)
colorschemes/Makefile.in (+46/-17)
colorschemes/solarized-dark.theme.in (+2/-2)
colorschemes/solarized-light.theme.in (+9/-0)
config.guess (+87/-64)
config.h.in (+0/-3)
config.sub (+14/-16)
configure (+274/-200)
configure.ac (+4/-4)
debian/changelog (+21/-0)
debian/control (+2/-2)
debian/patches/01_fix-encoding-menu-creation.patch (+0/-54)
debian/patches/series (+0/-2)
debian/patches/xubuntu_alternate-scroll.patch (+11/-6)
depcomp (+2/-1)
doc/Makefile.in (+51/-24)
doc/man/C/xfce4-terminal.1 (+3/-3)
doc/man/ar/xfce4-terminal.1 (+3/-3)
doc/man/ca/xfce4-terminal.1 (+3/-3)
doc/man/da/xfce4-terminal.1 (+3/-3)
doc/man/de/xfce4-terminal.1 (+3/-3)
doc/man/el/xfce4-terminal.1 (+3/-3)
doc/man/es/xfce4-terminal.1 (+3/-3)
doc/man/fr/xfce4-terminal.1 (+3/-3)
doc/man/gl/xfce4-terminal.1 (+3/-3)
doc/man/id/xfce4-terminal.1 (+7/-9)
doc/man/it/xfce4-terminal.1 (+3/-3)
doc/man/ja/xfce4-terminal.1 (+3/-3)
doc/man/ko/xfce4-terminal.1 (+3/-3)
doc/man/lt/xfce4-terminal.1 (+3/-3)
doc/man/pl/xfce4-terminal.1 (+3/-3)
doc/man/pt/xfce4-terminal.1 (+3/-3)
doc/man/pt_BR/xfce4-terminal.1 (+3/-3)
doc/man/ru/xfce4-terminal.1 (+3/-3)
doc/man/sr/xfce4-terminal.1 (+3/-3)
doc/man/sv/xfce4-terminal.1 (+3/-3)
doc/man/tr/xfce4-terminal.1 (+3/-3)
doc/man/ug/xfce4-terminal.1 (+3/-3)
doc/man/uk/xfce4-terminal.1 (+3/-3)
doc/man/zh_CN/xfce4-terminal.1 (+3/-3)
doc/po/Makefile.in (+45/-17)
doc/po/id.po (+117/-117)
doc/po/sr.po (+111/-119)
po/POTFILES.in (+1/-0)
po/ar.po (+383/-949)
po/bg.po (+376/-610)
po/cs.po (+351/-1176)
po/da.po (+160/-848)
po/de.po (+353/-1101)
po/el.po (+97/-492)
po/en_AU.po (+1240/-0)
po/en_GB.po (+91/-926)
po/es.po (+347/-1202)
po/eu.po (+16/-13)
po/fi.po (+172/-534)
po/fr.po (+101/-753)
po/he.po (+441/-1309)
po/hr.po (+46/-358)
po/hu.po (+351/-704)
po/id.po (+361/-1049)
po/nl.po (+73/-898)
po/oc.po (+1240/-0)
po/pt.po (+369/-623)
po/ru.po (+363/-363)
po/th.po (+1240/-0)
po/tr.po (+161/-990)
po/ug.po (+106/-447)
po/uk.po (+70/-755)
po/zh_CN.po (+372/-604)
po/zh_HK.po (+0/-1240)
po/zh_TW.po (+345/-900)
terminal/Makefile.in (+48/-19)
terminal/terminal-app.c (+14/-5)
terminal/terminal-preferences.c (+0/-13)
terminal/terminal-screen.c (+0/-13)
terminal/terminal-widget.c (+7/-5)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-terminal/0.6.3
Reviewer Review Type Date Requested Status
Logan Rosen (community) Approve
Ubuntu branches Pending
Review via email: mp+200151@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 :

Thanks. Uploaded.

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: