~ubuntu-branches/ubuntu/lucid/electricsheep/lucid

Viewing all changes in revision 18.

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-03-12 15:53:20 UTC
  • mfrom: (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080312155320-wuzvrk8pjfjt5hq1
Tags: 2.6.8-9ubuntu1
* Merge from Debian unstable. (LP: #201417) Remaining Ubuntu changes:
  - Merge debian/rules to keep our kscreensaver changes.
  - Add multihead support.
  - Fix typo in debian/rules to really install gnome-screensaver
    .desktop file into the screensavers directory
  - Modify Maintainer value to match Debian-Maintainer-Field Spec.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: