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

diff --git a/xorg-server/xkeyboard-config/README b/xorg-server/xkeyboard-config/README
index d91eda6e6..faaec09aa 100644
--- a/xorg-server/xkeyboard-config/README
+++ b/xorg-server/xkeyboard-config/README
@@ -1,28 +1,28 @@
-X Keyboard Extension
---------------------
-
-The X Keyboard Extension essentially replaces the core protocol definition of
-keyboard. The extension makes possible to clearly and explicitly specify most
-aspects of keyboard behaviour on per-key basis and to more closely track the
-logical and physical state of the keyboard. It also includes a number of
-keyboard controls designed to make keyboards more accessible to people with
-physical impairments.
-
-There are five types of components in the server database corresponing to five
-xkb symbolic names: symbols, geometry, keycodes, compat and types which
-determine the keyboard behaviour. These five components can combined together
-into a resulting keyboard mapping using the 'rules' component.
-
-The complete specification can be found on
-http://xfree86.org/current/XKBproto.pdf
-
-For XKB configuration information see 'docs/README.config' file.
-
-For information how to further enhance XKB configuration see 'docs/README.enhancing'
-file.
-
-For information how to replace existing XKB configuration database with 
-XKeyboardConfig see 'docs/HOWTO.transition' file.
-
-Contribution guidelines are described at
-http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules
+X Keyboard Extension

+--------------------

+

+The X Keyboard Extension essentially replaces the core protocol definition of

+keyboard. The extension makes possible to clearly and explicitly specify most

+aspects of keyboard behaviour on per-key basis and to more closely track the

+logical and physical state of the keyboard. It also includes a number of

+keyboard controls designed to make keyboards more accessible to people with

+physical impairments.

+

+There are five types of components in the server database corresponing to five

+xkb symbolic names: symbols, geometry, keycodes, compat and types which

+determine the keyboard behaviour. These five components can combined together

+into a resulting keyboard mapping using the 'rules' component.

+

+The complete specification can be found on

+http://xfree86.org/current/XKBproto.pdf

+

+For XKB configuration information see 'docs/README.config' file.

+

+For information how to further enhance XKB configuration see 'docs/README.enhancing'

+file.

+

+For information how to replace existing XKB configuration database with 

+XKeyboardConfig see 'docs/HOWTO.transition' file.

+

+Contribution guidelines are described at

+http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules