Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

3 files changed, 59 insertions, 59 deletions

diff --git a/xorg-server/hw/kdrive/fbdev/.gitignore b/xorg-server/hw/kdrive/fbdev/.gitignore
index 8569c9aed..80ad26623 100644
--- a/xorg-server/hw/kdrive/fbdev/.gitignore
+++ b/xorg-server/hw/kdrive/fbdev/.gitignore
@@ -1,2 +1,2 @@
-#		Add & Override for this directory and it's subdirectories

-Xfbdev

+#		Add & Override for this directory and it's subdirectories
+Xfbdev
diff --git a/xorg-server/hw/kdrive/fbdev/Makefile.am b/xorg-server/hw/kdrive/fbdev/Makefile.am
index 98d667ebd..ec9df95e0 100644
--- a/xorg-server/hw/kdrive/fbdev/Makefile.am
+++ b/xorg-server/hw/kdrive/fbdev/Makefile.am
@@ -1,29 +1,29 @@
-INCLUDES = 					\

-	@KDRIVE_INCS@				\

-	@KDRIVE_CFLAGS@

-

-noinst_LTLIBRARIES = libfbdev.la

-

-libfbdev_la_SOURCES =	\

-	fbdev.c		\

-	fbdev.h

-

-if KDRIVEFBDEV

-bin_PROGRAMS = Xfbdev

-

-Xfbdev_SOURCES = \

-	fbinit.c

-

-Xfbdev_LDADD = 						\

-	libfbdev.la					\

-	@KDRIVE_LIBS@

-

-Xfbdev_DEPENDENCIES =	\

-	libfbdev.la					\

-	$(KDRIVE_PURE_LIBS)

-

-Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

-

-relink:

-	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)

-endif

+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@KDRIVE_CFLAGS@
+
+noinst_LTLIBRARIES = libfbdev.la
+
+libfbdev_la_SOURCES =	\
+	fbdev.c		\
+	fbdev.h
+
+if KDRIVEFBDEV
+bin_PROGRAMS = Xfbdev
+
+Xfbdev_SOURCES = \
+	fbinit.c
+
+Xfbdev_LDADD = 						\
+	libfbdev.la					\
+	@KDRIVE_LIBS@
+
+Xfbdev_DEPENDENCIES =	\
+	libfbdev.la					\
+	$(KDRIVE_PURE_LIBS)
+
+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+
+relink:
+	$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
+endif
diff --git a/xorg-server/hw/kdrive/fbdev/Xfbdev.man b/xorg-server/hw/kdrive/fbdev/Xfbdev.man
index 6d0c23818..bfdae168f 100644
--- a/xorg-server/hw/kdrive/fbdev/Xfbdev.man
+++ b/xorg-server/hw/kdrive/fbdev/Xfbdev.man
@@ -1,28 +1,28 @@
-.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $

-.\"

-.TH Xfbdev 1 __vendorversion__

-.SH NAME

-Xfbdev \- Linux framebuffer device tiny X server

-.SH SYNOPSIS

-.B Xfbdev

-.RI [ :display ] 

-.RI [ option ...]

-.SH DESCRIPTION

-.B Xfbdev

-is a generic X server for Linux.

-.B Xfbdev

-doesn't know about any particular hardware, and uses the framebuffer

-provided by the Linux framebuffer device.

-.SH OPTIONS

-.B Xfbdev

-accepts the common options of the Xkdrive family of servers.  Please

-see Xkdrive(1).

-.SH KEYBOARD

-To be written.

-.SH SEE ALSO

-X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1).

-.SH AUTHORS

-The

-.B Xfbdev

-server was written by Keith Packard.

-

+.\" $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/Xfbdev.man,v 1.4 2001/01/27 18:20:40 dawes Exp $
+.\"
+.TH Xfbdev 1 __vendorversion__
+.SH NAME
+Xfbdev \- Linux framebuffer device tiny X server
+.SH SYNOPSIS
+.B Xfbdev
+.RI [ :display ] 
+.RI [ option ...]
+.SH DESCRIPTION
+.B Xfbdev
+is a generic X server for Linux.
+.B Xfbdev
+doesn't know about any particular hardware, and uses the framebuffer
+provided by the Linux framebuffer device.
+.SH OPTIONS
+.B Xfbdev
+accepts the common options of the Xkdrive family of servers.  Please
+see Xkdrive(1).
+.SH KEYBOARD
+To be written.
+.SH SEE ALSO
+X(__miscmansuffix__), Xserver(1), Xkdrive(1), xdm(1), xinit(1).
+.SH AUTHORS
+The
+.B Xfbdev
+server was written by Keith Packard.
+