prep for 7.1 rc4

diff --git a/Makefile b/Makefile
index a31ce386aae342b7bf3692765af7e332a55374ad..13f6422d04392f1e3e10c7aa5a148970129405bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -174,10 +174,10 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-DIRECTORY = Mesa-7.1-rc3
-LIB_NAME = MesaLib-7.1-rc3
-DEMO_NAME = MesaDemos-7.1-rc3
-GLUT_NAME = MesaGLUT-7.1-rc3
+DIRECTORY = Mesa-7.1-rc4
+LIB_NAME = MesaLib-7.1-rc4
+DEMO_NAME = MesaDemos-7.1-rc4
+GLUT_NAME = MesaGLUT-7.1-rc4
 
 MAIN_FILES = \
        $(DIRECTORY)/Makefile*                                          \
@@ -395,7 +395,8 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/samples/*.c                  \
        $(DIRECTORY)/progs/glsl/Makefile*               \
        $(DIRECTORY)/progs/glsl/*.c                     \
-       $(DIRECTORY)/progs/glsl/*.txt                   \
+       $(DIRECTORY)/progs/glsl/*.frag                  \
+       $(DIRECTORY)/progs/glsl/*.vert                  \
        $(DIRECTORY)/progs/windml/Makefile.ugl          \
        $(DIRECTORY)/progs/windml/*.c                   \
        $(DIRECTORY)/progs/windml/*.bmp                 \

diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 4258a114ed053c1a3704c0445a5eec375784a9b1..a9ef4bdffad5774cb0dfd6092c05c7142f632bfe 100644 (file)
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
 #define MESA_MAJOR 7
 #define MESA_MINOR 1
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.1 rc3"
+#define MESA_VERSION_STRING "7.1 rc4"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))