~ubuntu-branches/ubuntu/natty/basic256/natty

Viewing all changes in revision 6.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2010-11-24 10:52:48 UTC
  • mfrom: (1.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101124105248-g37gbqivoyknajr5
Tags: 0.9.6.48-1ubuntu1
* Merge from debian unstable (LP: #680841). Remaining changes:
  - debian/control: Build-Depend on libqtwebkit-dev. It has separated from
    libqt-dev. Fixes FTBFS

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: