diff options
author | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-31 08:14:38 +0100 |
commit | 3dc034dda1a451ed7dc48cfb10caba11e66b4132 (patch) | |
tree | ac2f7522e5b3287afdb5dcd5af6d9c6bb9a3d079 /mesalib/src/mesa/main/formats.c | |
parent | 4e7e0bd9194a033f05179fb64126c56fc6f072b5 (diff) | |
parent | 436f8246cd5a377596f6e42e6562da186ef8df48 (diff) | |
download | vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.gz vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.tar.bz2 vcxsrv-3dc034dda1a451ed7dc48cfb10caba11e66b4132.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
Diffstat (limited to 'mesalib/src/mesa/main/formats.c')
-rw-r--r-- | mesalib/src/mesa/main/formats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index 47a1d6802..1c9e63377 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -2649,7 +2649,7 @@ _mesa_format_to_type_and_comps(gl_format format, } /** - * Check if a gl_format exactly matches a GL formaat/type combination + * Check if a gl_format exactly matches a GL format/type combination * such that we can use memcpy() from one to the other. * \param gl_format a MESA_FORMAT_x value * \param format the user-specified image format |