xserver: Branch 'master'

[Aaron Plattner]

 hw/xfree86/common/vesamodes |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 97fd471a627be185bee8cda3f709cfccea3fa12d (from 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Oct 27 12:36:56 2006 -0700

    Fix standard VESA modes.
    
    The built-in mode timings were off slightly for the 640x480 at 60, 640x480 at 72,
    and 1024x768 at 75 modes.

diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes
index 851643f..2bc8862 100644
--- a/hw/xfree86/common/vesamodes
+++ b/hw/xfree86/common/vesamodes
@@ -16,10 +16,10 @@ ModeLine "640x400"    31.5  640  672  73
 ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
 
 # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
-ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
+ModeLine "640x480"    25.175 640  656  752  800    480  490  492  525 -hsync -vsync
 
 # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
-ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
+ModeLine "640x480"    31.5  640  664  704  832    480  489  492  520 -hsync -vsync
 
 # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
 ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
@@ -52,7 +52,7 @@ ModeLine "1024x768"   65.0 1024 1048 118
 ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
 
 # 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
-ModeLine "1024x768"   78.8 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
+ModeLine "1024x768"   78.75 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
 
 # 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
 ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync