← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/196_xvfb-fbscreeninit-handling.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Bryce Harrington, Robert Hooker, Timo Aaltonen, Robert Collins
  • Date: 2010-02-19 13:24:15 UTC
  • mfrom: (1.1.31 upstream) (0.11.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100219132415-4eovyfajq7ac45n3
Tags: 2:1.7.5-1ubuntu1
[ Bryce Harrington ]
[Robert Hooker]
* Add 106_nouveau_autodetect.patch: makes nouveau the default driver
  for supported cards when not explicitly named in xorg.conf.

[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 101, included in Debian.

[Robert Collins]
* Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
* Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/196_xvfb-fbscreeninit-handling.patch
1
1
=== modified file 'hw/vfb/InitOutput.c'
2
 
--- hw/vfb/InitOutput.c 2009-06-11 20:34:06 +0000
3
 
+++ hw/vfb/InitOutput.c 2010-02-02 16:34:02 +0000
 
2
--- a/hw/vfb/InitOutput.c       2009-06-11 20:34:06 +0000
 
3
+++ b/hw/vfb/InitOutput.c       2010-02-02 16:34:02 +0000
4
4
@@ -66,6 +66,7 @@
5
5
 #endif /* HAS_SHM */
6
6
 #include "dix.h"