← Back to branch summary

~peter-pearse/ubuntu/oneiric/xorg-server/prop001

« back to all changes in this revision

Viewing changes to debian/patches/157_check_null_modes.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-11 09:51:56 UTC
  • mfrom: (1.1.41 upstream) (0.1.26 experimental)
  • Revision ID: james.westby@ubuntu.com-20110411095156-ymlp7gnfsoplroug
Tags: 2:1.10.0.902-1ubuntu1
* Merge from Debian experimental.
  - dropped patches, included upstream:
    213_xichangehierarchy-check-oom.patch
    216_fix_sdksyms_build.diff, included upstream.
    218_getValuatorEvents_cleanup.patch
    219_xi1_handle_noncontinuous_valuator_data.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/157_check_null_modes.patch
1
1
Index: xorg-server/hw/xfree86/common/xf86VidMode.c
2
2
===================================================================
3
 
--- xorg-server.orig/hw/xfree86/common/xf86VidMode.c    2009-12-02 23:06:16.000000000 +0200
4
 
+++ xorg-server/hw/xfree86/common/xf86VidMode.c 2009-12-02 23:06:21.000000000 +0200
5
 
@@ -220,6 +220,9 @@
 
3
--- xorg-server.orig/hw/xfree86/common/xf86VidMode.c    2011-04-09 10:36:57.000000000 +0300
 
4
+++ xorg-server/hw/xfree86/common/xf86VidMode.c 2011-04-09 10:38:10.000000000 +0300
 
5
@@ -222,6 +222,9 @@
6
6
 
7
7
     pScrn = xf86Screens[scrnIndex];
8
8
     pVidMode = VMPTR(pScrn->pScreen);