Rev 6499: (vila) Merge 2.5 branch including bugfix for #940164 and #944696 in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 13 09:36:01 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6499 [merge]
revision-id: pqm at pqm.ubuntu.com-20120313093600-lb7qlh29e7d7kr68
parent: pqm at pqm.ubuntu.com-20120312190105-p9dg7dxetifq1k0w
parent: v.ladeuil+lp at free.fr-20120313090718-2e5wf4d6otbh2k2r
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-03-13 09:36:00 +0000
message:
(vila) Merge 2.5 branch including bugfix for #940164 and #944696
(Vincent Ladeuil)
removed:
bzrlib/doc_generate/builders/ bzrlibdoc_generatebu-20100428165216-u9zn4jkzna43f5br-1
bzrlib/doc_generate/builders/__init__.py __init__.py-20100429154052-obn9puc6h4srmfqf-1
bzrlib/doc_generate/builders/texinfo.py texinfo_builder.py-20100428165122-t24toqlqz1nxzsc0-1
bzrlib/doc_generate/writers/ bzrlibdoc_generatewr-20100428165220-eatkszxh2odj369n-1
bzrlib/doc_generate/writers/__init__.py __init__.py-20100429154053-q5ci11imur20p4up-1
bzrlib/doc_generate/writers/texinfo.py texinfo_writer.py-20100428165123-pgxf99nm4uc2iux4-1
bzrlib/tests/doc_generate/ doc_generate-20100429145829-nbgcdpmh32opmxzm-1
bzrlib/tests/doc_generate/__init__.py __init__.py-20100429153409-fpdr7jznxqojupd2-1
bzrlib/tests/doc_generate/builders/ builders-20100429153410-zb0jsypqgsx9zzrp-1
bzrlib/tests/doc_generate/builders/__init__.py __init__.py-20100429153416-pdpzy6hluos6jhyu-1
bzrlib/tests/doc_generate/builders/test_texinfo.py test_texinfo.py-20100429153416-rrbyt0aljyz1mgl8-1
bzrlib/tests/doc_generate/writers/ writers-20100706132137-6181ylqj6hcxrc5s-1
bzrlib/tests/doc_generate/writers/__init__.py __init__.py-20100706132147-3ilw5s1xjjsrvqil-1
bzrlib/tests/doc_generate/writers/test_texinfo.py test_texinfo.py-20100706132149-5xascqycp14tbyci-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
bzrlib/doc_generate/conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/features.py features.py-20090820042958-jglgza3wrn03ha9e-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/developers/conf.py conf.py-20090907074210-zula633ky077z6vu-4
doc/en/Makefile makefile-20090722133816-63ik5s6s5gsnz7zy-11
doc/en/conf.py conf.py-20090722133816-63ik5s6s5gsnz7zy-12
doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
doc/en/whats-new/whats-new-in-2.5.txt whatsnewin2.5.txt-20110711065040-xz9b4xba1qzlwp7m-1
doc/es/conf.py conf.py-20090907035530-u1c4vkpj8ki76jbr-4
doc/ja/conf.py conf.py-20091029100035-1rni8rgpen0pe1g2-10
doc/ru/conf.py conf.py-20090907052526-fe9f0itd9ikgtasa-4
Diff too large for email (1775 lines, the limit is 1000).
More information about the bazaar-commits
mailing list