diff options
| author | Ian Romanick <[email protected]> | 2008-07-25 18:31:44 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2008-07-25 18:31:44 -0700 |
| commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 (patch) | |
| tree | d114e55df428550c9829acf929b9fb7bcb89c429 /src/mesa/main/version.h | |
| parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b (diff) | |
| parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'src/mesa/main/version.h')
| -rw-r--r-- | src/mesa/main/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 2f459e517a5..4258a114ed0 100644 --- 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 rc1" +#define MESA_VERSION_STRING "7.1 rc3" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |