~ubuntu-branches/ubuntu/lucid/ktorrent/lucid

Viewing all changes in revision 60.

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-08-09 18:35:01 UTC
  • mfrom: (1.1.28 upstream) (0.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090809183501-4c17hz36wtgb29hr
Tags: 3.2.2+dfsg.2-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Add debian/patches, debian/patches/series, and 
    debian/patches/kubuntu_02_qt_phonon.diff since Kubuntu uses the Qt
    Phonon instead of KDE Phonon

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: