-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2011-06-17 10:40:36 UTC
-
mfrom:
(1.4.12 upstream)
(11.1.26 sid)
-
Revision ID:
james.westby@ubuntu.com-20110617104036-id4ml81yetasewp9
Tags: 270-1ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/patches/950_ubuntu_charclass_highlight.diff: Enabled URL
highlighting
- debian/patches/Add 951_uxterm_utf8_title.diff: Set utf8Titles to true by
default when using uxterm, so that it displays utf8 directories in titles
properly. May cause issues with apps that use control sequences for
updating the xterm titlebar - users should use xterm or set utf8Title
to false in this case.
- debian/gbp.conf: Use "Ubuntu" in "debian-branch" directly