~ubuntu-branches/ubuntu/maverick/liferea/maverick

Viewing all changes in revision 92.

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-02-08 19:53:55 UTC
  • mfrom: (1.2.58 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100208195355-y330v0xe54uqa0ao
Tags: 1.6.2-1ubuntu1
* Merge from debian testing. Remaining changes:
  - debian/patches/01_ubuntu_feedlists
    - ubuntu feedlist
    - remove example feeds from debian
  - debian/rules
    - Call intltool-update -p to generate translation template
  - debian/patches/fix_systray_behavior: fix systray mis-behaviour
    when Liferea is visible in another workspace.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: