~ubuntu-branches/ubuntu/lucid/gimp/lucid

Viewing all changes in revision 46.

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2009-06-21 17:20:03 UTC
  • mfrom: (0.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090621172003-l1z48px28r3ogr76
Tags: 2.6.6-1ubuntu1
* Merge with Debian unstable (LP: #389900), remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + updated some strings for ubuntu
  - debian/rules:
    + updated translation templates
  - debian/control:
    + Drop webkit build dependency. gimp is the only thing pulling in webkit
      for the desktop CDs, and makes them explode. Without the webkit help
      browser plugin, help will just be displayed in the default browser.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: