aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/doc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-22 14:29:51 +0000
committermarha <marha@users.sourceforge.net>2011-05-22 14:29:51 +0000
commit016747a04df9d4474489fe3b3d1c0f11a713148b (patch)
tree69722f37ac06c00d6674c7bf2df6597753b418e6 /xorg-server/doc
parent32a666fa1f26defd3b4e508b75f1acf6e2900a40 (diff)
parent52011cfedaa930d61d8f60b283a2051093727582 (diff)
downloadvcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.gz
vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.bz2
vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/doc')
-rw-r--r--xorg-server/doc/dtrace/Xserver-DTrace.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/doc/dtrace/Xserver-DTrace.xml b/xorg-server/doc/dtrace/Xserver-DTrace.xml
index e0425c8ee..72b8f4fa6 100644
--- a/xorg-server/doc/dtrace/Xserver-DTrace.xml
+++ b/xorg-server/doc/dtrace/Xserver-DTrace.xml
@@ -576,4 +576,3 @@ Xserver$1:::client-disconnect
</sect1>
</article>
-