mesa: Branch 'master'

[Oliver McFadden]

 src/mesa/shader/program.c |    4 ++--
 src/mesa/shader/program.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 95764262a7f2dfda761a0dbd87c3d9b12df0d534 (from 0c25d9ab198f79afee23ec1bf8ac61c4cd801d3a)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Thu Mar 15 21:57:31 2007 +0000

    Fixed a minor typo in the comment near _mesa_copy_instructions.

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 3d5f648..98daf70 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -1481,14 +1481,14 @@ _mesa_realloc_instructions(struct prog_i
 }
 
 /**
- * Copy an narray of program instructions.
+ * Copy an array of program instructions.
  * \param dest  pointer to destination.
  * \param src  pointer to source.
  * \param n  number of instructions to copy.
  * \return pointer to destination.
  */
 struct prog_instruction *
-_mesa_copy_instructions(struct prog_instruction *dest,
+_mesa_copy_instructions (struct prog_instruction *dest,
 			 const struct prog_instruction *src, GLuint n)
 {
   return _mesa_memcpy (dest, src, n * sizeof (struct prog_instruction));
diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h
index 6f5013d..7746289 100644
--- a/src/mesa/shader/program.h
+++ b/src/mesa/shader/program.h
@@ -129,7 +129,7 @@ _mesa_realloc_instructions(struct prog_i
                            GLuint numOldInst, GLuint numNewInst);
 
 extern struct prog_instruction *
-_mesa_copy_instructions(struct prog_instruction *dest,
+_mesa_copy_instructions (struct prog_instruction *dest,
 			 const struct prog_instruction *src, GLuint n);
 
 /**