xserver: Branch 'master'

[David Nusinow]

 hw/xfree86/parser/scan.c |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit f7ab2d3821e6bccc943f088e308fd58395a186d2
Author: David Nusinow <dnusinow at debian.org>
Date:   Sun Mar 2 18:36:25 2008 -0500

    Add missing file from previous commit.

diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 1f9b1b8..851b911 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -380,11 +380,20 @@ again:
 			if (c == '0')
 				if ((configBuf[configPos] == 'x') ||
 					(configBuf[configPos] == 'X'))
+                                {
 					base = 16;
+                                        val.numType = PARSE_HEX;
+                                }
 				else
+                                {
 					base = 8;
+                                        val.numType = PARSE_OCTAL;
+                                }
 			else
+                        {
 				base = 10;
+                                val.numType = PARSE_DECIMAL;
+                        }
 
 			configRBuf[0] = c;
 			i = 1;