aboutsummaryrefslogtreecommitdiff
path: root/include/xcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-10 10:38:33 +0200
committermarha <marha@users.sourceforge.net>2013-09-10 10:42:30 +0200
commit2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7 (patch)
treea32e3d5f8bb662ba5c14a72d97a553c4927c0b76 /include/xcb
parentd53900c52abc2402f978b72278712e4bcdbde9f2 (diff)
parent889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 (diff)
downloadvcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.gz
vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.tar.bz2
vcxsrv-2c1b75db27d66ff4760d624e44d1c1c6f42a4ca7.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013 Conflicts: mesalib/src/glsl/.gitignore xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winsetsp.c
Diffstat (limited to 'include/xcb')
-rw-r--r--include/xcb/xcb.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h
index 4722a270c..dda28bcdc 100644
--- a/include/xcb/xcb.h
+++ b/include/xcb/xcb.h
@@ -279,7 +279,6 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c);
/**
* @brief Returns the next event or error from the server.
* @param c: The connection to the X server.
- * error status of the operation.
* @return The next event from the server.
*
* Returns the next event or error from the server, if one is