-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Riddell
-
Date:
2008-12-11 20:27:09 UTC
-
mfrom:
(1.1.24 upstream)
(0.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20081211202709-4fjb6zqxc2ak27af
Tags: 3.1.5+dfsg.1-1ubuntu1
* Merge with Debian, remaining changes:
- Use Kubuntu's kde4.mk
- Add replaces/conflicts on ktorrent-kde4