diff options
| author | Ian Romanick <[email protected]> | 2009-12-21 18:45:31 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-12-21 18:45:31 -0800 |
| commit | a4b6b428855e73b35f754a9f64647c6edc1a88fa (patch) | |
| tree | 45422f07630a8f36264fe43d9d325305bf8085bd | |
| parent | ef171051349ac83695a9a8304d486e1adb503291 (diff) | |
| parent | 82184970d3aee822d945af7d4902359f28f7057f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
| -rw-r--r-- | docs/relnotes-7.6.1.html | 10 | ||||
| -rw-r--r-- | docs/relnotes-7.7.html | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 2 |
3 files changed, 19 insertions, 3 deletions
diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html index a41bcee81c2..19d54041b28 100644 --- a/docs/relnotes-7.6.1.html +++ b/docs/relnotes-7.6.1.html @@ -26,7 +26,15 @@ for DRI hardware acceleration. <h2>MD5 checksums</h2> <pre> -tbd +e80fabad2e3eb7990adae773d6aeacba MesaLib-7.6.1.tar.gz +7db4617e9e10ad3aca1b64339fd71b7d MesaLib-7.6.1.tar.bz2 +dd3275dbf9833480d2e92d0c69b22abd MesaLib-7.6.1.zip +f7fdcfe3c0f363e571c60f02f74368fb MesaDemos-7.6.1.tar.gz +a4226f06732a02556fcf6be290b86dff MesaDemos-7.6.1.tar.bz2 +849425f356bd940726cebedfa79de176 MesaDemos-7.6.1.zip +d40cc7c5e337a85b674e27a8e494f52f MesaGLUT-7.6.1.tar.gz +ca9aecb91f05b1da9fd7d5eeb19d47d7 MesaGLUT-7.6.1.tar.bz2 +23fad8398004c977a1d8953079b72ca6 MesaGLUT-7.6.1.zip </pre> diff --git a/docs/relnotes-7.7.html b/docs/relnotes-7.7.html index 8c8f763b6f2..de980238e5c 100644 --- a/docs/relnotes-7.7.html +++ b/docs/relnotes-7.7.html @@ -28,7 +28,15 @@ for DRI hardware acceleration. <h2>MD5 checksums</h2> <pre> -tbd +395c9516edf1ad54b0934d8db15557bf MesaLib-7.7.tar.gz +e3fa64a1508bc23dd9de9dd2cea7cfb1 MesaLib-7.7.tar.bz2 +e54903eb5e49c3969821fa16b32da245 MesaLib-7.7.zip +53b5b6f78e55de170d43c98cb6aaab7e MesaDemos-7.7.tar.gz +6fd616b27b9826d0faa23e08e05d9435 MesaDemos-7.7.tar.bz2 +240fe06159ad73d5e22c27033b66c80a MesaDemos-7.7.zip +9fe11a904b2a9d8cd06cc52bc330b716 MesaGLUT-7.7.tar.gz +e8dceed05a59a2d3c2619d7d734587e3 MesaGLUT-7.7.tar.bz2 +96af041d435349ee23ead4667ec36363 MesaGLUT-7.7.zip </pre> diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 1434ae530be..fb61ba62814 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -68,7 +68,7 @@ int INTEL_DEBUG = (0); #endif -#define DRIVER_DATE "20090712 2009Q2 RC3" +#define DRIVER_DATE "20091221 2009Q4" #define DRIVER_DATE_GEM "GEM " DRIVER_DATE |