diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
| commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
| tree | 1dbf32344313ad7e5884e6686251cad398a231fa /mesalib/docs/opengles.html | |
| parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
| parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
| download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'mesalib/docs/opengles.html')
| -rw-r--r-- | mesalib/docs/opengles.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/docs/opengles.html b/mesalib/docs/opengles.html index f08acb57b..24ad69fe2 100644 --- a/mesalib/docs/opengles.html +++ b/mesalib/docs/opengles.html @@ -16,7 +16,7 @@ <h1>OpenGL ES</h1> -<p>Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0. More informations about +<p>Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0. More information about OpenGL ES can be found at <a href="http://www.khronos.org/opengles/"> http://www.khronos.org/opengles/</a>.</p> @@ -48,7 +48,7 @@ EGL drivers for your hardware.</p> <h3>Dispatch Table</h3> -<p>OpenGL ES has an additional indirection when dispatching fucntions</p> +<p>OpenGL ES has an additional indirection when dispatching functions</p> <pre> Mesa: glFoo() --> _mesa_Foo() |