~ubuntu-branches/ubuntu/oneiric/pppoeconf/oneiric

Viewing all changes in revision 14.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2011-07-03 13:15:14 UTC
  • mfrom: (1.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110703131514-zn0umx1xc3rsspcr
Tags: 1.20ubuntu1
* Merge from debian unstable (LP: #799149). Remaining changes:
  - do not install the desktop file
* Dropped change (Superceeded in debian)
  - do not depend on modconf

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: