Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 44 insertions, 44 deletions

diff --git a/libX11/man/XGetXCBConnection.man b/libX11/man/XGetXCBConnection.man
index 3b4ad11f7..7f579bfce 100644
--- a/libX11/man/XGetXCBConnection.man
+++ b/libX11/man/XGetXCBConnection.man
@@ -1,44 +1,44 @@
-.\" Copyright \(co 2006 Josh Triplett
-.\"
-.\" Permission is hereby granted, free of charge, to any person obtaining
-.\" a copy of this software and associated documentation files (the
-.\" "Software"), to deal in the Software without restriction, including
-.\" without limitation the rights to use, copy, modify, merge, publish,
-.\" distribute, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.TH XGetXCBConnection __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
-.SH NAME
-XGetXCBConnection \- get the XCB connection for an Xlib Display
-.SH SYNTAX
-.HP
- #include <X11/Xlib-xcb.h>
-.HP
-xcb_connection_t *XGetXCBConnection(Display *\fIdpy\fP); 
-.SH ARGUMENTS
-.IP \fIdpy\fP 1i
-Specifies the connection to the X server.
-.IN "Environment" "DISPLAY"
-.SH DESCRIPTION
-The \fIXGetXCBConnection\fP function returns the XCB connection associated with
-an Xlib Display.  Clients can use this XCB connection with functions from the
-XCB library, just as they would with an XCB connection created with XCB.
-Callers of this function must link to libX11-xcb and a version of Xlib built
-with XCB support.
-.SH "SEE ALSO"
-XOpenDisplay(__libmansuffix__),
-XSetEventQueueOwner(__libmansuffix__),
-.br
-\fIXlib \- C Language X Interface\fP
+.\" Copyright \(co 2006 Josh Triplett

+.\"

+.\" Permission is hereby granted, free of charge, to any person obtaining

+.\" a copy of this software and associated documentation files (the

+.\" "Software"), to deal in the Software without restriction, including

+.\" without limitation the rights to use, copy, modify, merge, publish,

+.\" distribute, sublicense, and/or sell copies of the Software, and to

+.\" permit persons to whom the Software is furnished to do so, subject to

+.\" the following conditions:

+.\"

+.\" The above copyright notice and this permission notice shall be included

+.\" in all copies or substantial portions of the Software.

+.\"

+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR

+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+.\" OTHER DEALINGS IN THE SOFTWARE.

+.\"

+.TH XGetXCBConnection __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

+.SH NAME

+XGetXCBConnection \- get the XCB connection for an Xlib Display

+.SH SYNTAX

+.HP

+ #include <X11/Xlib-xcb.h>

+.HP

+xcb_connection_t *XGetXCBConnection(Display *\fIdpy\fP); 

+.SH ARGUMENTS

+.IP \fIdpy\fP 1i

+Specifies the connection to the X server.

+.IN "Environment" "DISPLAY"

+.SH DESCRIPTION

+The \fIXGetXCBConnection\fP function returns the XCB connection associated with

+an Xlib Display.  Clients can use this XCB connection with functions from the

+XCB library, just as they would with an XCB connection created with XCB.

+Callers of this function must link to libX11-xcb and a version of Xlib built

+with XCB support.

+.SH "SEE ALSO"

+XOpenDisplay(__libmansuffix__),

+XSetEventQueueOwner(__libmansuffix__),

+.br

+\fIXlib \- C Language X Interface\fP