xserver: Branch 'master'

[Eric Anholt]

 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree adfe8e7437ff739f54d1d074008e8cc0e3bcb4d3 (from 63c169e3b1f7d6a7375a414fcd50cce32358a525)
Author: Eric Anholt <anholt at FreeBSD.org>
Date:   Tue Jun 27 21:49:00 2006 +0200

    Bump server release to 7.1.99.1.
    
    This will be important for a couple of cairo workaround tests.

diff --git a/configure.ac b/configure.ac
index b8d942e..af7d066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,9 +294,9 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME", 
 DEFAULT_VENDOR_NAME="The X.Org Foundation"
 DEFAULT_VENDOR_NAME_SHORT="X.Org"
 DEFAULT_VERSION_MAJOR=7
-DEFAULT_VERSION_MINOR=0
-DEFAULT_VERSION_PATCH=0
-DEFAULT_VERSION_SNAP=0
+DEFAULT_VERSION_MINOR=1
+DEFAULT_VERSION_PATCH=99
+DEFAULT_VERSION_SNAP=1
 DEFAULT_RELEASE_DATE="21 December 2005"
 DEFAULT_VENDOR_WEB="http://wiki.x.org"