~ubuntu-branches/ubuntu/maverick/libmtp/maverick

Viewing all changes in revision 23.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-11-06 18:34:31 UTC
  • mfrom: (0.1.2 experimental) (16.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106183431-v0g6li7r45mff75c
Tags: 0.3.7-7ubuntu1
* Merge to Debian testing; Remaining Ubuntu changes:
  - src/music-players.h: Drop "Sansa e280" product ID 0x7421, since it's
    just the e280 in MSC mode; we already use PTP mode, and these two
    conflict. Taken from upstream CVS. (LP: #355998)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: