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

diff --git a/xkbcomp/xkbpath.h b/xkbcomp/xkbpath.h
index 66c3ab76b..e9ebeda0e 100644
--- a/xkbcomp/xkbpath.h
+++ b/xkbcomp/xkbpath.h
@@ -1,65 +1,65 @@
-/************************************************************
- 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 _XKBPATH_H_
-#define _XKBPATH_H_ 1
-
-extern Bool XkbInitIncludePath(void);
-
-extern void XkbClearIncludePath(void);
-
-extern void XkbAddDefaultDirectoriesToPath(void);
-
-extern Bool XkbAddDirectoryToPath(const char *  /* dir */
-    );
-
-extern char *XkbDirectoryForInclude(unsigned    /* type */
-    );
-
-extern FILE *XkbFindFileInPath(char * /* name */ ,
-                               unsigned /* type */ ,
-                               char **  /* pathRtrn */
-    );
-
-extern void *XkbAddFileToCache(char * /* name */ ,
-                               unsigned /* type */ ,
-                               char * /* path */ ,
-                               void *   /* data */
-    );
-
-extern void *XkbFindFileInCache(char * /* name */ ,
-                                unsigned /* type */ ,
-                                char ** /* pathRtrn */
-    );
-
-extern Bool XkbParseIncludeMap(char ** /* str_inout */ ,
-                               char ** /* file_rtrn */ ,
-                               char ** /* map_rtrn */ ,
-                               char * /* nextop_rtrn */ ,
-                               char **  /* extra_data */
-    );
-
-#endif /* _XKBPATH_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 _XKBPATH_H_

+#define _XKBPATH_H_ 1

+

+extern Bool XkbInitIncludePath(void);

+

+extern void XkbClearIncludePath(void);

+

+extern void XkbAddDefaultDirectoriesToPath(void);

+

+extern Bool XkbAddDirectoryToPath(const char *  /* dir */

+    );

+

+extern char *XkbDirectoryForInclude(unsigned    /* type */

+    );

+

+extern FILE *XkbFindFileInPath(char * /* name */ ,

+                               unsigned /* type */ ,

+                               char **  /* pathRtrn */

+    );

+

+extern void *XkbAddFileToCache(char * /* name */ ,

+                               unsigned /* type */ ,

+                               char * /* path */ ,

+                               void *   /* data */

+    );

+

+extern void *XkbFindFileInCache(char * /* name */ ,

+                                unsigned /* type */ ,

+                                char ** /* pathRtrn */

+    );

+

+extern Bool XkbParseIncludeMap(char ** /* str_inout */ ,

+                               char ** /* file_rtrn */ ,

+                               char ** /* map_rtrn */ ,

+                               char * /* nextop_rtrn */ ,

+                               char **  /* extra_data */

+    );

+

+#endif /* _XKBPATH_H_ */