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 /src/mesa | |
| parent | ef171051349ac83695a9a8304d486e1adb503291 (diff) | |
| parent | 82184970d3aee822d945af7d4902359f28f7057f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |