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

diff --git a/libX11/src/xcms/QWhite.c b/libX11/src/xcms/QWhite.c
index 1f89f2e20..36b764c9d 100644
--- a/libX11/src/xcms/QWhite.c
+++ b/libX11/src/xcms/QWhite.c
@@ -1,84 +1,84 @@
-

-/*

- * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.

- * 	All Rights Reserved

- *

- * This file is a component of an X Window System-specific implementation

- * of Xcms based on the TekColor Color Management System.  Permission is

- * hereby granted to use, copy, modify, sell, and otherwise distribute this

- * software and its documentation for any purpose and without fee, provided

- * that this copyright, permission, and disclaimer notice is reproduced in

- * all copies of this software and in supporting documentation.  TekColor

- * is a trademark of Tektronix, Inc.

- *

- * Tektronix makes no representation about the suitability of this software

- * for any purpose.  It is provided "as is" and with all faults.

- *

- * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,

- * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

- * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX 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 THE PERFORMANCE OF THIS SOFTWARE.

- *

- *

- *	NAME

- *		XcmsQWhite.c - Query White

- *

- *	DESCRIPTION

- *		Routine to obtain a color specification for full

- *		red, green, and blue intensities.

- *

- *

- */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include "Xcms.h"

-

-

-

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

- *									*

- *			PUBLIC INTERFACES				*

- *									*

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

-

-/*

- *	NAME

- *		XcmsQueryWhite

- *

- *	SYNOPSIS

- */

-

-Status

-XcmsQueryWhite(

-    XcmsCCC ccc,

-    XcmsColorFormat target_format,

-    XcmsColor *pColor_ret)

-/*

- *	DESCRIPTION

- *		Returns the color specification in the target format for

- *		full intensity red, green, and blue.

- *

- *	RETURNS

- *		Returns XcmsSuccess, if failed; otherwise XcmsFailure

- *

- */

-{

-    XcmsColor tmp;

-

-    tmp.format = XcmsRGBiFormat;

-    tmp.pixel = 0;

-    tmp.spec.RGBi.red = 1.0;

-    tmp.spec.RGBi.green = 1.0;

-    tmp.spec.RGBi.blue = 1.0;

-    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {

-	return(XcmsFailure);

-    }

-    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));

-    return(XcmsSuccess);

-}

+
+/*
+ * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
+ * 	All Rights Reserved
+ *
+ * This file is a component of an X Window System-specific implementation
+ * of Xcms based on the TekColor Color Management System.  Permission is
+ * hereby granted to use, copy, modify, sell, and otherwise distribute this
+ * software and its documentation for any purpose and without fee, provided
+ * that this copyright, permission, and disclaimer notice is reproduced in
+ * all copies of this software and in supporting documentation.  TekColor
+ * is a trademark of Tektronix, Inc.
+ *
+ * Tektronix makes no representation about the suitability of this software
+ * for any purpose.  It is provided "as is" and with all faults.
+ *
+ * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE,
+ * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL TEKTRONIX 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 THE PERFORMANCE OF THIS SOFTWARE.
+ *
+ *
+ *	NAME
+ *		XcmsQWhite.c - Query White
+ *
+ *	DESCRIPTION
+ *		Routine to obtain a color specification for full
+ *		red, green, and blue intensities.
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xcms.h"
+
+
+
+/************************************************************************
+ *									*
+ *			PUBLIC INTERFACES				*
+ *									*
+ ************************************************************************/
+
+/*
+ *	NAME
+ *		XcmsQueryWhite
+ *
+ *	SYNOPSIS
+ */
+
+Status
+XcmsQueryWhite(
+    XcmsCCC ccc,
+    XcmsColorFormat target_format,
+    XcmsColor *pColor_ret)
+/*
+ *	DESCRIPTION
+ *		Returns the color specification in the target format for
+ *		full intensity red, green, and blue.
+ *
+ *	RETURNS
+ *		Returns XcmsSuccess, if failed; otherwise XcmsFailure
+ *
+ */
+{
+    XcmsColor tmp;
+
+    tmp.format = XcmsRGBiFormat;
+    tmp.pixel = 0;
+    tmp.spec.RGBi.red = 1.0;
+    tmp.spec.RGBi.green = 1.0;
+    tmp.spec.RGBi.blue = 1.0;
+    if (XcmsConvertColors(ccc, &tmp, 1, target_format, NULL) != XcmsSuccess) {
+	return(XcmsFailure);
+    }
+    memcpy((char *)pColor_ret, (char *)&tmp, sizeof(XcmsColor));
+    return(XcmsSuccess);
+}