Merge branch 'mesa_7_7_branch'

Conflicts: src/mesa/main/version.h
2009-12-21 18:45:31 -08:00
parent ef17105134 82184970d3
commit a4b6b42885
3 changed files with 19 additions and 3 deletions
--- 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