diff options
author | Brian Paul <brianp@vmware.com> | 2009-12-21 18:35:54 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-12-21 18:35:54 -0700 |
commit | 2020d69c921ea4affc58ca6d2b3ed88aa65946d1 (patch) | |
tree | 0edc9fc4b045b5a56f8f60f4ab138beb8592c3a0 /Makefile | |
parent | 639a3ea8ce699dcfb294b0e7ee25509ba6e639d8 (diff) | |
parent | 015aca75ab0749d6e8fdd81fcbabb0143c3e4259 (diff) | |
download | mesa-demos-2020d69c921ea4affc58ca6d2b3ed88aa65946d1.tar.gz |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -182,7 +182,7 @@ ultrix-gcc: # Rules for making release tarballs -VERSION=7.7-rc2 +VERSION=7.7 DIRECTORY = Mesa-$(VERSION) LIB_NAME = MesaLib-$(VERSION) DEMO_NAME = MesaDemos-$(VERSION) |