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

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp
index a4af79f35..331257a82 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/jp
@@ -1,35 +1,35 @@
-// JIS symbol mapping for Apple Aluminium Keyboard

-// (Damien Ciabrini <damien.ciabrini@gmail.com>)

-//

-// The JIS version of the Aluminium Keyboard is made of

-//   QWERTY-like map for the latin part

-//   PC98-like map for the kana part

-//   EISU and KANA keys found on other Apple keyboards

-

-partial default alphanumeric_keys

-xkb_symbols "usmac" {

-    name[Group1]	= "Japan - Macintosh, US map";

-    include "jp(common)"

-

-    key <JPCM> { [ KP_Separator ] };

-    key <AE13> { [ yen, bar 	] };

-    replace key <AE10> { [ 0		] };

-    replace key <AB11> { [ underscore	] };

-    replace key <CAPS> { [ Caps_Lock ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "mac" {

-    name[Group1]	= "Japan - Macintosh";

-    include "jp(kana)"

-

-    replace key <CAPS> { [ Caps_Lock ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "alujiskeys" {

-    // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja

-    // see keycodes macintosh(jisevdev)

-    replace key <HJCV> { [ Hiragana_Katakana ] };

-    replace key <HNGL> { [ Eisu_toggle ] };

-};

+// JIS symbol mapping for Apple Aluminium Keyboard
+// (Damien Ciabrini <damien.ciabrini@gmail.com>)
+//
+// The JIS version of the Aluminium Keyboard is made of
+//   QWERTY-like map for the latin part
+//   PC98-like map for the kana part
+//   EISU and KANA keys found on other Apple keyboards
+
+partial default alphanumeric_keys
+xkb_symbols "usmac" {
+    name[Group1]	= "Japan - Macintosh, US map";
+    include "jp(common)"
+
+    key <JPCM> { [ KP_Separator ] };
+    key <AE13> { [ yen, bar 	] };
+    replace key <AE10> { [ 0		] };
+    replace key <AB11> { [ underscore	] };
+    replace key <CAPS> { [ Caps_Lock ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "mac" {
+    name[Group1]	= "Japan - Macintosh";
+    include "jp(kana)"
+
+    replace key <CAPS> { [ Caps_Lock ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "alujiskeys" {
+    // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja
+    // see keycodes macintosh(jisevdev)
+    replace key <HJCV> { [ Hiragana_Katakana ] };
+    replace key <HNGL> { [ Eisu_toggle ] };
+};