mesa: Branch 'master'

[Gary Wong]

 src/mesa/main/matrix.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 24a495fd77f98b666c1f17e88a8134301cb8dee7 (from 0ae74048355497ebca4f606e01311a659db6c120)
Author: Gary Wong <gtw at gnu.org>
Date:   Fri Dec 15 17:18:36 2006 -0500

    Fix copy-and-paste mistake in comment ("scaling" should read "translation").
    
    Before _mesa_Translatef().

diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 7339b0c..b2aa83e 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -427,7 +427,7 @@ _mesa_Scalef( GLfloat x, GLfloat y, GLfl
 
 
 /**
- * Multiply the current matrix with a general scaling matrix.
+ * Multiply the current matrix with a translation matrix.
  *
  * \param x translation vector x coordinate.
  * \param y translation vector y coordinate.