diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/docs/dispatch.html | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/docs/dispatch.html')
| -rw-r--r-- | mesalib/docs/dispatch.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/docs/dispatch.html b/mesalib/docs/dispatch.html index aacd01e0c..c96ec2de3 100644 --- a/mesalib/docs/dispatch.html +++ b/mesalib/docs/dispatch.html @@ -204,9 +204,8 @@ terribly relevant.</p> few preprocessor defines.</p> <ul> -<li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li> -<li>If <tt>HAVE_PTHREAD</tt> is defined, method #3 is used.</li> -<li>If <tt>WIN32_THREADS</tt> is defined, method #2 is used.</li> +<li>If <tt>GLX_USE_TLS</tt> is defined, method #3 is used.</li> +<li>If <tt>HAVE_PTHREAD</tt> is defined, method #2 is used.</li> <li>If none of the preceding are defined, method #1 is used.</li> </ul> |