xserver: Branch 'master'

[Alan Hourihane]

 GL/glx/glxscreens.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 67bd672c880869ef625ae0c0163c3ec1eba46abf (from 733c4beb16c2c4ad9e9a4ea9a85b09fc5062a775)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Aug 24 08:47:06 2006 +0100

    Fix typo

diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 865fcba..40de9ee 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -78,7 +78,7 @@ static const char GLServerExtensions[] =
 			"GL_EXT_copy_texture "
 			"GL_EXT_draw_range_elements "
 			"GL_EXT_fog_coord "
-			"GL_EXT_framebuffe_object "
+			"GL_EXT_framebuffer_object "
 			"GL_EXT_multi_draw_arrays "
 			"GL_EXT_packed_pixels "
 			"GL_EXT_point_parameters "