Merge ~3v1n0/ubuntu/+source/vte2.91:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/vte2.91:ubuntu/master

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 78f02f63cd146d5f8cad06ff5338147e000c0684
Proposed branch: ~3v1n0/ubuntu/+source/vte2.91:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/vte2.91:ubuntu/master
Diff against target: 44620 lines (+25346/-6374)
128 files modified
AUTHORS (+1/-1)
COPYING.GPL3 (+675/-0)
COPYING.LGPL2 (+0/-0)
COPYING.LGPL3 (+165/-0)
ChangeLog (+2529/-48)
Makefile.am (+3/-1)
Makefile.in (+6/-4)
aclocal.m4 (+0/-38)
bindings/Makefile.in (+1/-1)
bindings/gir/Makefile.in (+1/-1)
bindings/vala/Makefile.in (+1/-1)
config.h.in (+5/-2)
configure (+422/-39)
configure.ac (+18/-4)
debian/changelog (+46/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/copyright (+79/-9)
debian/gbp.conf (+9/-0)
debian/libvte-2.91-0.docs (+0/-2)
debian/libvte-2.91-0.symbols (+3/-0)
debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch (+8/-8)
debian/patches/01_scroll_notebook.patch (+2/-2)
debian/patches/91_keep_fds.patch (+8/-4)
debian/patches/pthread-vs-nostdlib.patch (+1/-1)
debian/patches/revert-pcre2.patch (+156/-157)
debian/watch (+1/-1)
dev/null (+0/-160)
doc/Makefile.am (+1/-2)
doc/Makefile.in (+2/-3)
doc/reference/Makefile.am (+20/-8)
doc/reference/Makefile.in (+21/-9)
doc/reference/html/VteTerminal.html (+265/-189)
doc/reference/html/annotation-glossary.html (+7/-2)
doc/reference/html/api-index-0-52.html (+2/-2)
doc/reference/html/api-index-0-54.html (+34/-0)
doc/reference/html/api-index-deprecated.html (+28/-0)
doc/reference/html/api-index-full.html (+4/-0)
doc/reference/html/index.html (+2/-1)
doc/reference/html/vte-Version-Information.html (+2/-2)
doc/reference/html/vte.devhelp2 (+7/-5)
doc/reference/version.xml (+1/-1)
doc/reference/vte-docs.xml (+4/-0)
doc/reference/vte-sections.txt (+5/-4)
glade/Makefile.in (+1/-1)
m4/ax_cxx_compile_stdcxx.m4 (+1/-3)
perf/Makefile.in (+1/-1)
po/POTFILES.in (+0/-1)
po/cs.po (+12/-52)
po/da.po (+16/-21)
po/de.po (+17/-18)
po/el.po (+17/-19)
po/es.po (+13/-12)
po/fi.po (+17/-21)
po/fr.po (+18/-14)
po/fur.po (+12/-12)
po/gl.po (+17/-17)
po/hu.po (+17/-19)
po/id.po (+13/-13)
po/it.po (+17/-19)
po/kk.po (+16/-20)
po/ko.po (+14/-56)
po/lt.po (+15/-16)
po/lv.po (+16/-17)
po/oc.po (+16/-17)
po/pl.po (+12/-12)
po/pt_BR.po (+18/-19)
po/ro.po (+14/-14)
po/sl.po (+18/-20)
po/sv.po (+14/-14)
po/tr.po (+17/-16)
po/zh_CN.po (+14/-13)
po/zh_TW.po (+12/-13)
src/Makefile.am (+152/-44)
src/Makefile.in (+461/-219)
src/app/Makefile.in (+1/-1)
src/app/app.cc (+52/-14)
src/buffer.h (+1/-0)
src/cell.hh (+8/-73)
src/chunk.cc (+65/-0)
src/chunk.hh (+80/-0)
src/debug.cc (+47/-2)
src/debug.h (+20/-15)
src/modes-ecma.hh (+201/-0)
src/modes-private.hh (+845/-0)
src/modes-test.cc (+90/-0)
src/modes.hh (+250/-0)
src/parser-arg.hh (+186/-0)
src/parser-c01.hh (+73/-0)
src/parser-cat.cc (+547/-0)
src/parser-charset-tables.hh (+230/-0)
src/parser-charset.hh (+306/-0)
src/parser-cmd.hh (+330/-0)
src/parser-csi.hh (+212/-0)
src/parser-dcs.hh (+47/-0)
src/parser-esc.hh (+70/-0)
src/parser-glue.hh (+1002/-0)
src/parser-osc.hh (+100/-0)
src/parser-reply.hh (+68/-0)
src/parser-string.hh (+138/-0)
src/parser-test.cc (+1484/-0)
src/parser.cc (+1334/-0)
src/parser.hh (+193/-0)
src/refptr-test.cc (+135/-0)
src/refptr.hh (+38/-0)
src/ring.cc (+497/-539)
src/ring.hh (+263/-0)
src/tabstops-test.cc (+234/-0)
src/tabstops.hh (+222/-0)
src/utf8-test.cc (+349/-0)
src/utf8.cc (+47/-0)
src/utf8.hh (+83/-0)
src/vte.cc (+1289/-1620)
src/vte.sh (+2/-2)
src/vte/vtedeprecated.h (+21/-0)
src/vte/vteglobals.h (+6/-0)
src/vte/vteterminal.h (+4/-15)
src/vtedefines.hh (+7/-10)
src/vtedraw.cc (+0/-22)
src/vtedraw.hh (+0/-1)
src/vtegtk.cc (+185/-87)
src/vteinternal.hh (+275/-273)
src/vterowdata.cc (+11/-1)
src/vterowdata.hh (+83/-0)
src/vteseq.cc (+7531/-2232)
src/vtetypes.hh (+5/-0)
src/widget.cc (+364/-0)
src/widget.hh (+168/-0)
Reviewer Review Type Date Requested Status
Iain Lane Approve
Review via email: mp+354629@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Cheers, also done but again with a different finalise since I added the bug reference.

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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