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, 38 insertions, 38 deletions

diff --git a/xorg-server/README b/xorg-server/README
index b2499a059..58abd8e87 100644
--- a/xorg-server/README
+++ b/xorg-server/README
@@ -1,38 +1,38 @@
-					X Server
-
-The X server accepts requests from client applications to create windows,
-which are (normally rectangular) "virtual screens" that the client program
-can draw into.
-
-Windows are then composed on the actual screen by the X server
-(or by a separate composite manager) as directed by the window manager,
-which usually communicates with the user via graphical controls such as buttons
-and draggable titlebars and borders.
-
-For a comprehensive overview of X Server and X Window System, consult the
-following article:
-http://en.wikipedia.org/wiki/X_server
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/xserver
-
-        http://cgit.freedesktop.org/xorg/xserver
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
+					X Server

+

+The X server accepts requests from client applications to create windows,

+which are (normally rectangular) "virtual screens" that the client program

+can draw into.

+

+Windows are then composed on the actual screen by the X server

+(or by a separate composite manager) as directed by the window manager,

+which usually communicates with the user via graphical controls such as buttons

+and draggable titlebars and borders.

+

+For a comprehensive overview of X Server and X Window System, consult the

+following article:

+http://en.wikipedia.org/wiki/X_server

+

+All questions regarding this software should be directed at the

+Xorg mailing list:

+

+        http://lists.freedesktop.org/mailman/listinfo/xorg

+

+Please submit bug reports to the Xorg bugzilla:

+

+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg

+

+The master development code repository can be found at:

+

+        git://anongit.freedesktop.org/git/xorg/xserver

+

+        http://cgit.freedesktop.org/xorg/xserver

+

+For patch submission instructions, see:

+

+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches

+

+For more information on the git code manager, see:

+

+        http://wiki.x.org/wiki/GitPage

+