Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/README.WIN32
	mesalib/docs/install.html
	mesalib/src/glu/sgi/include/gluos.h
	mesalib/src/mesa/drivers/windows/gdi/wgl.c
	mesalib/src/mesa/main/state.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/tnl/t_draw.c

1 files changed, 2 insertions, 5 deletions

diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html
index 313f36337..16b3cad7a 100644
--- a/mesalib/docs/install.html
+++ b/mesalib/docs/install.html
@@ -281,17 +281,14 @@ by -debug for debug builds.
 To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do

 </p>

 <pre>

-    scons platform=windows toolchain=crossmingw machine=x86 statetrackers=mesa drivers=softpipe,trace winsys=gdi

+    scons platform=windows toolchain=crossmingw machine=x86 mesagdi libgl-gdi

 </pre>

 <p>

 This will create:

 </p>

 <ul>

+<li>build/windows-x86-debug/mesa/drivers/windows/gdi/opengl32.dll &mdash; Mesa + swrast, binary compatible with Windows's opengl32.dll 

 <li>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll &mdash; Mesa + Gallium + softpipe, binary compatible with Windows's opengl32.dll 

-<li>build/windows-x86-debug/glut/glx/glut32.dll

-<li>progs/build/windows-x86-debug/wgl/wglinfo.exe

-<li>progs/build/windows-x86-debug/trivial/tri.exe

-<li>and many other samples in progs/build/windows-x86-debug/...

 </ul>

 <p>

 Put them all in the same directory to test them.