~ubuntu-branches/ubuntu/maverick/psi/maverick

Viewing all changes in revision 8.

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2009-05-04 07:41:20 UTC
  • mfrom: (6.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090504074120-iui3exld9scpfwrd
Tags: 0.12.1-1ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
  - Upstream commit d440f16e1241915fed1d859c93ab54cb738112af; applied
    inline. To make psi work with Qt 4.5
  - debian-control: Don't build-depend on Qt << 4.5.0

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: