4 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/Makefile.OSMesa16 b/src/mesa/Makefile.OSMesa16
index 7417e2d82c..4963ec47ed 100644
--- a/src/mesa/Makefile.OSMesa16
+++ b/src/mesa/Makefile.OSMesa16
@@ -9,7 +9,7 @@
 TOP = ../..
 
 GL_MAJOR = 1
-GL_MINOR = 4
+GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 OSMESA_LIB_NAME = "OSMesa16"  # may be overridden in Make-config
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 7a0e82c86e..1fd6f204ed 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -6,7 +6,7 @@
 TOP = ../..
 
 GL_MAJOR = 1
-GL_MINOR = 4
+GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 GL_LIB_NAME = "GL"  # may be overridden in Make-config
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 32491d9d34..cec9892106 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.0
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -6380,7 +6380,7 @@ _mesa_GetString( GLenum name )
    static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
    static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
    static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
-   static const char *version_1_5 = "1.4 Mesa " MESA_VERSION_STRING;
+   static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 371a6e59a1..7871e55b1b 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.0
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,10 +28,10 @@
 
 
 /* Mesa version */
-#define MESA_MAJOR 5
-#define MESA_MINOR 1
+#define MESA_MAJOR 6
+#define MESA_MINOR 0
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "5.1"
+#define MESA_VERSION_STRING "6.0"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
@@ -40,9 +40,9 @@
 
 /* OpenGL API version */
 #define OPENGL_MAJOR 1
-#define OPENGL_MINOR 4
+#define OPENGL_MINOR 5
 #define OPENGL_PATCH 0
-#define OPENGL_VERSION_STRING "1.4"
+#define OPENGL_VERSION_STRING "1.5"
 
 /* To make version comparison easy */
 #define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))