diff options
| author | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
| commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
| tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /src/mesa/main | |
| parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
| parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dd.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_fxt1.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 197de09b22a..7c02faaa535 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -1072,7 +1072,7 @@ struct dd_function_table { * These are the initial values to be installed into dispatch by * mesa. If the T&L driver wants to modify the dispatch table * while installed, it must do so itself. It would be possible for - * the vertexformat to install it's own initial values for these + * the vertexformat to install its own initial values for these * functions, but this way there is an obvious list of what is * expected of the driver. * diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index 149853f7acd..04acf05e528 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -476,7 +476,7 @@ fxt1_lloyd (GLfloat vec[][MAX_COMP], GLint nv, * for each sample color * sort to nearest vector. * - * replace each vector with the centroid of it's matching colors. + * replace each vector with the centroid of its matching colors. * * repeat until RMS doesn't improve. * |