diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-24 08:40:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:50:12 +0200 |
| commit | c24a0fccb18e611b2879e68565ab8f1c5c5dbd62 (patch) | |
| tree | 8b2070725227ae6c92ded43789f80347fabac306 /mesalib/docs/osmesa.html | |
| parent | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (diff) | |
| parent | 0ebcd32e91486caccc041c8ca23e39e160b24702 (diff) | |
| download | vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.gz vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.bz2 vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 24 sep 2012
Conflicts:
pixman/pixman/pixman-sse2.c
xorg-server/dix/window.c
Diffstat (limited to 'mesalib/docs/osmesa.html')
| -rw-r--r-- | mesalib/docs/osmesa.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/docs/osmesa.html b/mesalib/docs/osmesa.html index 0ec67c44b..b0609cf88 100644 --- a/mesalib/docs/osmesa.html +++ b/mesalib/docs/osmesa.html @@ -34,8 +34,7 @@ more information about the API functions. </p> <p> -There are several examples of OSMesa in the <code>progs/osdemos/</code> -directory. +There are several examples of OSMesa in the mesa/demos repository. </p> |