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

1 files changed, 43 insertions, 43 deletions

diff --git a/xorg-server/xkb/Makefile.am b/xorg-server/xkb/Makefile.am
index b05693288..fb3ccbf6f 100644
--- a/xorg-server/xkb/Makefile.am
+++ b/xorg-server/xkb/Makefile.am
@@ -1,43 +1,43 @@
-noinst_LTLIBRARIES = libxkb.la libxkbstubs.la

-

-AM_CFLAGS = $(DIX_CFLAGS)

-

-DDX_SRCS = \

-        ddxBeep.c \

-        ddxCtrls.c \

-        ddxLEDs.c \

-        ddxLoad.c \

-        ddxList.c

-

-DIX_SRCS = \

-        xkb.c \

-        xkbUtils.c \

-        xkbEvents.c \

-        xkbAccessX.c \

-        xkbSwap.c \

-        xkbLEDs.c \

-        xkbInit.c \

-        xkbActions.c \

-        xkbPrKeyEv.c

-

-# this should be replaced by a common library or something, ideally -d

-XKBFILE_SRCS = \

-        maprules.c \

-        xkmread.c \

-        xkbtext.c \

-        xkbfmisc.c \

-        xkbout.c

-

-X11_SRCS = \

-        XKBMisc.c \

-        XKBAlloc.c \

-        XKBGAlloc.c \

-        XKBMAlloc.c

-

-libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)

-libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c

-

-EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h

-

-xkbcompileddir = $(XKB_COMPILED_DIR)

-dist_xkbcompiled_DATA = README.compiled

+noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+DDX_SRCS = \
+        ddxBeep.c \
+        ddxCtrls.c \
+        ddxLEDs.c \
+        ddxLoad.c \
+        ddxList.c
+
+DIX_SRCS = \
+        xkb.c \
+        xkbUtils.c \
+        xkbEvents.c \
+        xkbAccessX.c \
+        xkbSwap.c \
+        xkbLEDs.c \
+        xkbInit.c \
+        xkbActions.c \
+        xkbPrKeyEv.c
+
+# this should be replaced by a common library or something, ideally -d
+XKBFILE_SRCS = \
+        maprules.c \
+        xkmread.c \
+        xkbtext.c \
+        xkbfmisc.c \
+        xkbout.c
+
+X11_SRCS = \
+        XKBMisc.c \
+        XKBAlloc.c \
+        XKBGAlloc.c \
+        XKBMAlloc.c
+
+libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS)
+libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
+
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
+
+xkbcompileddir = $(XKB_COMPILED_DIR)
+dist_xkbcompiled_DATA = README.compiled