~ubuntu-branches/ubuntu/maverick/pilot-link/maverick

Viewing all changes in revision 30.

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-27 12:18:43 UTC
  • mfrom: (1.1.6 upstream) (4.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100627121843-huwmfy8wemc7b2or
Tags: 0.12.5-2ubuntu1
* Merge from debian unstable.  Remaining changes: LP: #598958
  - debian/control: Add Breaks to ensure the right version of udev is used.
    (Change has to be continued as udev versioning in debian and
     ubuntu are different before 141-1).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: