← Back to branch summary

~peter-pearse/ubuntu/natty/file/prop001

Viewing all changes in revision 34.

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-10-30 19:00:33 UTC
  • mfrom: (1.1.14 upstream) (10.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20101030190033-8ses31ylnf3fz5y6
Tags: 5.04-5ubuntu1
https://launchpad.net/bugs/668729
* Merge from debian unstable (LP: #668729), remaining changes:
  - Fix recognition of mime-type application/x-iso9660-image (LP: 458677):
    + add debian/patches/300-magic-fix-iso9660-image.patch
  - Fix bad tabs for OpenSSH DSA/RSA public keys (LP: 533553):
    + fix debian/patches/208-magic-add-ssh.patch

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: