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

2 files changed, 141 insertions, 141 deletions

diff --git a/xorg-server/hw/xwin/glx/winpriv.h b/xorg-server/hw/xwin/glx/winpriv.h
index 8cac86caf..710525ccc 100644
--- a/xorg-server/hw/xwin/glx/winpriv.h
+++ b/xorg-server/hw/xwin/glx/winpriv.h
@@ -1,13 +1,13 @@
-/*

- * Export window information for the Windows-OpenGL GLX implementation.

- *

- * Authors: Alexander Gottwald

- */

-

-#include <X11/Xwindows.h>

-#include <windowstr.h>

-

-#define WIN_GL_WINDOW_CLASS "XWinGLTest"

-

-HWND winGetWindowInfo(WindowPtr pWin);

-Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);

+/*
+ * Export window information for the Windows-OpenGL GLX implementation.
+ *
+ * Authors: Alexander Gottwald
+ */
+
+#include <X11/Xwindows.h>
+#include <windowstr.h>
+
+#define WIN_GL_WINDOW_CLASS "XWinGLTest"
+
+HWND winGetWindowInfo(WindowPtr pWin);
+Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
diff --git a/xorg-server/hw/xwin/system.XWinrc b/xorg-server/hw/xwin/system.XWinrc
index 267809145..f0771c610 100644
--- a/xorg-server/hw/xwin/system.XWinrc
+++ b/xorg-server/hw/xwin/system.XWinrc
@@ -1,128 +1,128 @@
-# XWin Server Resource File - EXAMPLE

-# Earle F. Philhower, III

-

-# Place in ~/.XWinrc or in /etc/X11/system.XWinrc

-

-# Keywords are case insensitive, comments legal pretty much anywhere

-# you can have an end-of-line

-

-# Comments begin with "#" or "//" and go to the end-of-line

-

-# Paths to commands are **cygwin** based (i.e. /usr/local/bin/xcalc)

-

-# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)

-

-# Menus are defined as...

-# MENU <name> {

-#	<Menu Text>	EXEC	<command>

-#                               ^^ This command will have any "%display%"

-#                                  string replaced with the proper display

-#                                  variable (i.e. 127.0.0.1:<display>.0)

-#                                  (This should only rarely be needed as

-#                                  the DISPLAY environment variable is also

-#                                  set correctly)

-#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>

-#  or	<Menu Text>	ALWAYSONTOP

-#                         ^^ Sets the window to display above all others

-#  or   <Menu Text>	RELOAD

-#                         ^^ Causes ~/.XWinrc or the system.XWinrc file

-#                            to be reloaded and icons and menus regenerated

-#  or	SEPARATOR

-#       ...

-# }

-

-# Set the taskmar menu with

-# ROOTMENU <name-of-some-prior-defined-menu>

-

-# If you want a menu to be applied to all popup window's system menu

-# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>

-

-# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...

-# SYSMENU {

-#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>

-#	...

-# }

-

-# When specifying an ICONFILE in the following commands several different

-# formats are allowed:

-# 1. Name of a regular Windows .ico format file

-#    (ex:  "cygwin.ico", "apple.ico")

-# 2. Name and index into a Windows .DLL

-#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon

-#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)

-# 3. Index into XWin.EXE internal ICON resource

-#    (ex: ",101" is the 1st icon inside XWin.exe)

-

-# To define where ICO files live (** Windows path**)

-# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>

-# NOTE: If you specify a fully qualified path to an ICON below

-#             (i.e. "c:\xxx" or "d:\xxxx")

-#       this ICONDIRECTORY will not be prepended

-

-# To change the taskbar icon use...

-# TRAYICON       <name-of-windows-ico-file-in-icondirectory>

-

-# To define a replacement for the standard X icon for apps w/o specified icons

-# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>

-

-# To define substitute icons on a per-window basis use...

-# ICONS {

-#	<class-or-name-of-window> <icon-file-name.ico>

-#	...

-# }

-# In the case where multiple matches occur, the first listed in the ICONS

-# section will be chosen.

-

-# To disable exit confirmation dialog add the line containing SilentExit

-

-# DEBUG <string> prints out the string to the XWin.log file

-

-// Below are just some silly menus to demonstrate writing your

-// own configuration file.

-

-// Make some menus...

-menu apps {

-	xterm	exec	"xterm"

-	"Emacs"	exec	"emacs"

-	notepad	exec	notepad

-	xload	exec	"xload -display %display%"  # Comment

-}

-

-menu root {

-// Comments fit here, too...

-	"Reload .XWinrc"	RELOAD

-	"Applications"	menu	apps

-	SEParATOR

-}

-

-menu aot {

-	Separator

-	"Always on Top"	alwaysontop

-}

-

-menu xtermspecial {

-	"Emacs"		exec	"emacs"

-	"Always on Top"	alwaysontop

-	SepArAtor

-}

-

-RootMenu root

-

-DefaultSysMenu aot atend

-

-SysMenu {

-	"xterm"	xtermspecial atstart

-}

-

-# IconDirectory	"c:\winnt\"

-

-# DefaultIcon	"reinstall.ico"

-

-# Icons {

-# 	"xterm"	"uninstall.ico"

-# }

-

-SilentExit

-

-DEBUG "Done parsing the configuration file..."

-

+# XWin Server Resource File - EXAMPLE
+# Earle F. Philhower, III
+
+# Place in ~/.XWinrc or in /etc/X11/system.XWinrc
+
+# Keywords are case insensitive, comments legal pretty much anywhere
+# you can have an end-of-line
+
+# Comments begin with "#" or "//" and go to the end-of-line
+
+# Paths to commands are **cygwin** based (i.e. /usr/local/bin/xcalc)
+
+# Paths to icons are **WINDOWS** based (i.e. c:\windows\icons)
+
+# Menus are defined as...
+# MENU <name> {
+#	<Menu Text>	EXEC	<command>
+#                               ^^ This command will have any "%display%"
+#                                  string replaced with the proper display
+#                                  variable (i.e. 127.0.0.1:<display>.0)
+#                                  (This should only rarely be needed as
+#                                  the DISPLAY environment variable is also
+#                                  set correctly)
+#  or	<Menu Text>	MENU	<name-of-some-prior-defined-menu>
+#  or	<Menu Text>	ALWAYSONTOP
+#                         ^^ Sets the window to display above all others
+#  or   <Menu Text>	RELOAD
+#                         ^^ Causes ~/.XWinrc or the system.XWinrc file
+#                            to be reloaded and icons and menus regenerated
+#  or	SEPARATOR
+#       ...
+# }
+
+# Set the taskmar menu with
+# ROOTMENU <name-of-some-prior-defined-menu>
+
+# If you want a menu to be applied to all popup window's system menu
+# DEFAULTSYSMENU <name-of-some-prior-defined-menu> <atstart|atend>
+
+# To choose a specific menu for a specific WM_CLASS or WM_NAME use ...
+# SYSMENU {
+#	<class-or-name-of-window> <name-of-prior-defined-menu> <atstart|atend>
+#	...
+# }
+
+# When specifying an ICONFILE in the following commands several different
+# formats are allowed:
+# 1. Name of a regular Windows .ico format file
+#    (ex:  "cygwin.ico", "apple.ico")
+# 2. Name and index into a Windows .DLL
+#    (ex: "c:\windows\system32\shell32.dll,4" gives the default folder icon
+#         "c:\windows\system32\shell32.dll,5" gives the floppy drive icon)
+# 3. Index into XWin.EXE internal ICON resource
+#    (ex: ",101" is the 1st icon inside XWin.exe)
+
+# To define where ICO files live (** Windows path**)
+# ICONDIRECTORY	<windows-path i.e. c:\cygwin\usr\icons>
+# NOTE: If you specify a fully qualified path to an ICON below
+#             (i.e. "c:\xxx" or "d:\xxxx")
+#       this ICONDIRECTORY will not be prepended
+
+# To change the taskbar icon use...
+# TRAYICON       <name-of-windows-ico-file-in-icondirectory>
+
+# To define a replacement for the standard X icon for apps w/o specified icons
+# DEFAULTICON	<name-of-windows-ico-file-in-icondirectory>
+
+# To define substitute icons on a per-window basis use...
+# ICONS {
+#	<class-or-name-of-window> <icon-file-name.ico>
+#	...
+# }
+# In the case where multiple matches occur, the first listed in the ICONS
+# section will be chosen.
+
+# To disable exit confirmation dialog add the line containing SilentExit
+
+# DEBUG <string> prints out the string to the XWin.log file
+
+// Below are just some silly menus to demonstrate writing your
+// own configuration file.
+
+// Make some menus...
+menu apps {
+	xterm	exec	"xterm"
+	"Emacs"	exec	"emacs"
+	notepad	exec	notepad
+	xload	exec	"xload -display %display%"  # Comment
+}
+
+menu root {
+// Comments fit here, too...
+	"Reload .XWinrc"	RELOAD
+	"Applications"	menu	apps
+	SEParATOR
+}
+
+menu aot {
+	Separator
+	"Always on Top"	alwaysontop
+}
+
+menu xtermspecial {
+	"Emacs"		exec	"emacs"
+	"Always on Top"	alwaysontop
+	SepArAtor
+}
+
+RootMenu root
+
+DefaultSysMenu aot atend
+
+SysMenu {
+	"xterm"	xtermspecial atstart
+}
+
+# IconDirectory	"c:\winnt\"
+
+# DefaultIcon	"reinstall.ico"
+
+# Icons {
+# 	"xterm"	"uninstall.ico"
+# }
+
+SilentExit
+
+DEBUG "Done parsing the configuration file..."
+