-
Committer:
Bazaar Package Importer
-
Author(s):
Christopher James Halse Rogers
-
Date:
2010-06-08 18:22:37 UTC
-
mfrom:
(1.1.19 upstream)
(14.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100608182237-d8duvizd661d0raj
Tags: 1:2.1.17-3ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
+ debian/patches/100_fedora-panel-fix.patch:
- Don't discard EDID blocks just because their input type bit
disagrees with the hardware connection sensing; this usually
just means the block is lying. (cf. LP: 188549).
* 105_gf7025_gf7050.patch:
+ Drop, these cards are supported by new upstream version.
* 0001-Move-the-logic-for-matching-devices-out-of-probe-rou.patch:
* 0002-Run-the-parsing-script-to-generate-an-initial-list-o.patch:
+ Drop. These patches are annoying to update, and their task can be
handled better in the new X server's autoconfiguration paths.