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/lists.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/lists.html')
| -rw-r--r-- | mesalib/docs/lists.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/docs/lists.html b/mesalib/docs/lists.html index 1c35037e7..0ac07faf4 100644 --- a/mesalib/docs/lists.html +++ b/mesalib/docs/lists.html @@ -68,7 +68,12 @@ kernels, see the </p> -<br> +<h1>IRC</h1> + +<p>join <a href="irc://chat.freenode.net#dri-devel">#dri-devel channel</a> +on <a href="http://webchat.freenode.net/">irc.freenode.net</a> +</p> + <h1>OpenGL Forums</h1> |