aboutsummaryrefslogtreecommitdiff
path: root/mesalib/docs/devinfo.html
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-30 08:11:58 +0200
committermarha <marha@users.sourceforge.net>2011-08-30 08:11:58 +0200
commitccddacee74b1f043b146265297c8abbde6317df7 (patch)
treed6ddca10b5d19de1f14e56d7013a8591f4bfe658 /mesalib/docs/devinfo.html
parent52a690f156b6388c2219610d4e9cd88b79d24203 (diff)
parent82ce0534a7bc89f1ed93b4b952b30ceb3d94210d (diff)
downloadvcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.gz
vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.tar.bz2
vcxsrv-ccddacee74b1f043b146265297c8abbde6317df7.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/drivers/dri/common/texmem.c mesalib/src/mesa/main/context.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/debug.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'mesalib/docs/devinfo.html')
-rw-r--r--mesalib/docs/devinfo.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index d9e82e29d..678e48c01 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -142,9 +142,9 @@ Places that are not directly visible to the GL API should prefer the use
of <tt>bool</tt>, <tt>true</tt>, and
<tt>false</tt> over <tt>GLboolean</tt>, <tt>GL_TRUE</tt>, and
<tt>GL_FALSE</tt>. In C code, this may mean that
-<tt>#include &lt;stdbool.h&gt;</tt> need to be added. The
+<tt>#include &lt;stdbool.h&gt;</tt> needs to be added. The
<tt>try_emit_</tt>* methods in src/mesa/program/ir_to_mesa.cpp and
-src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as an example.
+src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples.
</p>