mesa: Branch 'master'

[Michel Daenzer]

 src/mesa/drivers/dri/intel/intel_tex_layout.c |    2 +-
 src/mesa/drivers/dri/intel/intel_tex_layout.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree fde908444af5c826bce84203a9cb4273d8341ed0 (from e0c9361a7cd16cc008220cf1933fba4371f46753)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Dec 14 12:57:59 2006 +0100

    Fix copy-and-paste-o of my e-mail address.

diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c b/src/mesa/drivers/dri/intel/intel_tex_layout.c
index b503175..f356480 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c
@@ -27,7 +27,7 @@
  /*
   * Authors:
   *   Keith Whitwell <keith at tungstengraphics.com>
-  *   Michel Dänzer <keith at tungstengraphics.com>
+  *   Michel Dänzer <michel at tungstengraphics.com>
   */
 
 #include "intel_mipmap_tree.h"
diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.h b/src/mesa/drivers/dri/intel/intel_tex_layout.h
index e685d47..1e37f8f 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.h
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.h
@@ -27,7 +27,7 @@
  /*
   * Authors:
   *   Keith Whitwell <keith at tungstengraphics.com>
-  *   Michel Dänzer <keith at tungstengraphics.com>
+  *   Michel Dänzer <michel at tungstengraphics.com>
   */
 
 #include "macros.h"