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

diff --git a/xorg-server/xkeyboard-config/xslt/xfree86.xsl b/xorg-server/xkeyboard-config/xslt/xfree86.xsl
index 8b4e84976..29345b747 100644
--- a/xorg-server/xkeyboard-config/xslt/xfree86.xsl
+++ b/xorg-server/xkeyboard-config/xslt/xfree86.xsl
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xsl:stylesheet version="1.0" 

-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

-  >

-<xsl:output method="xml"

-            encoding="UTF-8"

-            doctype-system="xkb.dtd"

-            indent="yes"/>

-  

-  <!-- Transform all "simple" elements as they are -->

-  <xsl:template match="@*|xkbConfigRegistry|layout|layoutList|model|modelList|group|option|optionList|variant|variantList">

-    <xsl:copy>

-      <xsl:apply-templates select="@*|*"/>

-    </xsl:copy>

-  </xsl:template>

-

-  <!-- Tricky business: configItem -->

-  <xsl:template match="configItem">

-    <configItem xsl:space="preserve">

-      <name><xsl:value-of select="./name"/></name>

-      <!-- If there are some shortDescriptions -->

-      <xsl:if test="count(./shortDescription)!=0">

-        <!-- First, put the non-translated version -->

-        <shortDescription><xsl:value-of select="./shortDescription[not(@xml:lang)]"/></shortDescription>

-        <!-- For all translated versions ... -->

-        <xsl:for-each select="./shortDescription[@xml:lang]">

-          <!-- ... which are different from non-translated one ... -->

-          <xsl:if test="../shortDescription[not(@xml:lang)]/text() != ./text()">

-            <!-- ... - output! -->

-            <shortDescription xml:lang="{./@xml:lang}"><xsl:value-of select="./text()"/></shortDescription>

-          </xsl:if>

-        </xsl:for-each>

-      </xsl:if>

-      <!-- If there are some descriptions -->

-      <xsl:if test="count(./description)!=0">

-        <!-- First, put the non-translated version -->

-        <description><xsl:value-of select="./description[not(@xml:lang)]"/></description>

-        <!-- For all translated versions ... -->

-        <xsl:for-each select="./description[@xml:lang]">

-          <!-- ... which are different from non-translated one ... -->

-          <xsl:if test="../description[not(@xml:lang)]/text() != ./text()">

-            <!-- ... - output! -->

-            <description xml:lang="{./@xml:lang}"><xsl:value-of select="./text()"/></description>

-          </xsl:if>

-        </xsl:for-each>

-      </xsl:if>

-    </configItem>

-  </xsl:template>

-  

-</xsl:stylesheet>

+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  >
+<xsl:output method="xml"
+            encoding="UTF-8"
+            doctype-system="xkb.dtd"
+            indent="yes"/>
+  
+  <!-- Transform all "simple" elements as they are -->
+  <xsl:template match="@*|xkbConfigRegistry|layout|layoutList|model|modelList|group|option|optionList|variant|variantList">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|*"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Tricky business: configItem -->
+  <xsl:template match="configItem">
+    <configItem xsl:space="preserve">
+      <name><xsl:value-of select="./name"/></name>
+      <!-- If there are some shortDescriptions -->
+      <xsl:if test="count(./shortDescription)!=0">
+        <!-- First, put the non-translated version -->
+        <shortDescription><xsl:value-of select="./shortDescription[not(@xml:lang)]"/></shortDescription>
+        <!-- For all translated versions ... -->
+        <xsl:for-each select="./shortDescription[@xml:lang]">
+          <!-- ... which are different from non-translated one ... -->
+          <xsl:if test="../shortDescription[not(@xml:lang)]/text() != ./text()">
+            <!-- ... - output! -->
+            <shortDescription xml:lang="{./@xml:lang}"><xsl:value-of select="./text()"/></shortDescription>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:if>
+      <!-- If there are some descriptions -->
+      <xsl:if test="count(./description)!=0">
+        <!-- First, put the non-translated version -->
+        <description><xsl:value-of select="./description[not(@xml:lang)]"/></description>
+        <!-- For all translated versions ... -->
+        <xsl:for-each select="./description[@xml:lang]">
+          <!-- ... which are different from non-translated one ... -->
+          <xsl:if test="../description[not(@xml:lang)]/text() != ./text()">
+            <!-- ... - output! -->
+            <description xml:lang="{./@xml:lang}"><xsl:value-of select="./text()"/></description>
+          </xsl:if>
+        </xsl:for-each>
+      </xsl:if>
+    </configItem>
+  </xsl:template>
+  
+</xsl:stylesheet>