At file:///home/vila/src/bzr/bugs/219334-texinfo/ ------------------------------------------------------------ revno: 5217 [merge] revision-id: [email protected] parent: [email protected] parent: [email protected] committer: Vincent Ladeuil <[email protected]> branch nick: texinfo timestamp: Mon 2010-07-05 17:50:19 +0200 message: Merge cleanup into texinfo fixing conflicts modified: bzrlib/doc_generate/conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
=== modified file 'bzrlib/doc_generate/conf.py' --- a/bzrlib/doc_generate/conf.py 2010-04-29 16:10:59 +0000 +++ b/bzrlib/doc_generate/conf.py 2010-07-05 15:50:19 +0000 @@ -38,7 +38,7 @@ # General information about the project. project = u'Bazaar' -copyright = u'2010, Canonical Ltd' +copyright = u'2009, 2010, Canonical Ltd' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
