diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-03-12 19:00:47 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2010-03-12 19:00:47 +0100 |
| commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
| tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /src/mesa/math | |
| parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
| parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/mesa/math')
| -rw-r--r-- | src/mesa/math/m_debug_util.h | 2 | ||||
| -rw-r--r-- | src/mesa/math/m_matrix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h index 2e67db8e55..ed11c849ec 100644 --- a/src/mesa/math/m_debug_util.h +++ b/src/mesa/math/m_debug_util.h @@ -61,7 +61,7 @@ extern long counter_overhead; */ extern char *mesa_profile; -/* Modify the the number of tests if you like. +/* Modify the number of tests if you like. * We take the minimum of all results, because every error should be * positive (time used by other processes, task switches etc). * It is assumed that all calculations are done in the cache. diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index ef8a40fbec..4b33d0bbb3 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -889,7 +889,7 @@ _math_matrix_rotate( GLmatrix *mat, * Y-axis to bring the axis vector parallel with the X-axis. The * rotation about the X-axis is then performed. Ry and Rz are * simply the respective inverse transforms to bring the arbitrary - * axis back to it's original orientation. The first transforms + * axis back to its original orientation. The first transforms * Rz' and Ry' are considered inverses, since the data from the * arbitrary axis gives you info on how to get to it, not how * to get away from it, and an inverse must be applied. |