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

Viewing all changes in revision 19.

  • Committer: Bazaar Package Importer
  • Author(s): Ezra Reeves
  • Date: 2010-01-26 14:14:25 UTC
  • mfrom: (2.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100126141425-wqafcn0rnpxm0p07
Tags: 2.7~b12+svn20091224-1ubuntu1
* Merge from debian testing, (LP: #484013) remaining changes:
  - Merge debian/rules to keep our kscreensaver changes.
* New upstream version closes (LP: #5823) and (LP: #372040)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: