summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@vmware.com>2009-01-16 16:44:53 +0000
committerAlan Hourihane <alanh@vmware.com>2009-01-16 16:44:53 +0000
commit2e28c1fda24988241ef7abb91b7d896e38f5df26 (patch)
tree593e70705d1f60babd77697b75f7618a94c6703b /Makefile
parent47ca0234dc9f83808cb141944537c78eaade5d55 (diff)
parente442fe5ba53acf16c78339f19921d70dba3928f6 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/slang/slang_compile.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d3cb0912918..9d839595790 100644
--- a/Makefile
+++ b/Makefile
@@ -182,10 +182,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.3-rc1
-LIB_NAME = MesaLib-7.3-rc1
-DEMO_NAME = MesaDemos-7.3-rc1
-GLUT_NAME = MesaGLUT-7.3-rc1
+DIRECTORY = Mesa-7.3-rc2
+LIB_NAME = MesaLib-7.3-rc2
+DEMO_NAME = MesaDemos-7.3-rc2
+GLUT_NAME = MesaGLUT-7.3-rc2
MAIN_FILES = \
$(DIRECTORY)/Makefile* \