~ubuntu-branches/ubuntu/oneiric/midori/oneiric-updates

Viewing all changes in revision 21.

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-02-01 20:27:20 UTC
  • mfrom: (1.1.14 upstream) (3.3.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110201202720-xobt459otz1m6sas
Tags: 0.3.0-1.1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - debian/control, debian/rules:
    + Change build-depends from libwebkit-dev to libwebkitgtk-dev.
* debian/patches/desktop-scheme-handler-types:
  - Dropped, fixed upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: