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

diff --git a/xkbcomp/vmod.h b/xkbcomp/vmod.h
index 61bfc6a24..559b9d504 100644
--- a/xkbcomp/vmod.h
+++ b/xkbcomp/vmod.h
@@ -1,78 +1,78 @@
-/************************************************************

- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.

-

- Permission to use, copy, modify, and distribute this

- software and its documentation for any purpose and without

- fee is hereby granted, provided that the above copyright

- notice appear in all copies and that both that copyright

- notice and this permission notice appear in supporting

- documentation, and that the name of Silicon Graphics not be 

- used in advertising or publicity pertaining to distribution 

- of the software without specific prior written permission.

- Silicon Graphics makes no representation about the suitability 

- of this software for any purpose. It is provided "as is"

- without any express or implied warranty.

- 

- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 

- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 

- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 

- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

- THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

- ********************************************************/

-

-#ifndef VMOD_H

-#define VMOD_H 1

-

-typedef struct _VModInfo

-{

-    XkbDescPtr xkb;

-    unsigned defined;

-    unsigned available;

-    unsigned newlyDefined;

-    int errorCount;

-} VModInfo;

-

-extern void InitVModInfo(VModInfo * /* info */ ,

-                         XkbDescPtr     /* xkb */

-    );

-

-extern void ClearVModInfo(VModInfo * /* info */ ,

-                          XkbDescPtr    /* xkb */

-    );

-

-extern Bool HandleVModDef(VModDef * /* stmt */ ,

-                          unsigned /* mergeMode */ ,

-                          VModInfo *    /* info */

-    );

-

-extern Bool ApplyVModDefs(VModInfo * /* info */ ,

-                          XkbDescPtr    /* xkb */

-    );

-

-extern int LookupVModIndex(XPointer /* priv */ ,

-                           Atom /* elem */ ,

-                           Atom /* field */ ,

-                           unsigned /* type */ ,

-                           ExprResult * /* val_rtrn */

-    );

-

-extern int LookupVModMask(XPointer /* priv */ ,

-                          Atom /* elem */ ,

-                          Atom /* field */ ,

-                          unsigned /* type */ ,

-                          ExprResult *  /* val_rtrn */

-    );

-

-extern int FindKeypadVMod(XkbDescPtr    /* xkb */

-    );

-

-extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,

-                                   ExprResult * /* value_rtrn */ ,

-                                   VModInfo *   /* info */

-    );

-

-#endif /* VMOD_H */

+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be 
+ used in advertising or publicity pertaining to distribution 
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability 
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+ 
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+
+#ifndef VMOD_H
+#define VMOD_H 1
+
+typedef struct _VModInfo
+{
+    XkbDescPtr xkb;
+    unsigned defined;
+    unsigned available;
+    unsigned newlyDefined;
+    int errorCount;
+} VModInfo;
+
+extern void InitVModInfo(VModInfo * /* info */ ,
+                         XkbDescPtr     /* xkb */
+    );
+
+extern void ClearVModInfo(VModInfo * /* info */ ,
+                          XkbDescPtr    /* xkb */
+    );
+
+extern Bool HandleVModDef(VModDef * /* stmt */ ,
+                          unsigned /* mergeMode */ ,
+                          VModInfo *    /* info */
+    );
+
+extern Bool ApplyVModDefs(VModInfo * /* info */ ,
+                          XkbDescPtr    /* xkb */
+    );
+
+extern int LookupVModIndex(XPointer /* priv */ ,
+                           Atom /* elem */ ,
+                           Atom /* field */ ,
+                           unsigned /* type */ ,
+                           ExprResult * /* val_rtrn */
+    );
+
+extern int LookupVModMask(XPointer /* priv */ ,
+                          Atom /* elem */ ,
+                          Atom /* field */ ,
+                          unsigned /* type */ ,
+                          ExprResult *  /* val_rtrn */
+    );
+
+extern int FindKeypadVMod(XkbDescPtr    /* xkb */
+    );
+
+extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
+                                   ExprResult * /* value_rtrn */ ,
+                                   VModInfo *   /* info */
+    );
+
+#endif /* VMOD_H */