~ubuntu-branches/ubuntu/oneiric/xfce4-panel/oneiric

Viewing all changes in revision 60.

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2011-06-19 17:52:17 UTC
  • mfrom: (4.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110619175217-54qvmlck97fbhny5
Tags: 4.8.3-3ubuntu1
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_support-multiple-vendor-default-configs.patch: search for
      the default.xml default config in XDG_CONFIG_DIRS as well, and do
      not display the chooser dialog in this case. lp: #747137
    + series: refreshed.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: