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

diff --git a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
index 00f9ede0f..f60c80290 100644
--- a/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sgi_vndr/jp
@@ -1,44 +1,44 @@
-xkb_symbols "jp106" {

-

-    name[group1]="Japan/ASCII";

-

-    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };

-    key <AE01> {         [               1,          exclam ] };

-    key <AE02> {         [               2,        quotedbl ] };

-    key <AE03> {         [               3,      numbersign ] };

-    key <AE04> {         [               4,          dollar ] };

-    key <AE05> {         [               5,         percent ] };

-    key <AE06> {         [               6,       ampersand ] };

-    key <AE07> {         [               7,      apostrophe ] };

-    key <AE08> {         [               8,       parenleft ] };

-    key <AE09> {         [               9,      parenright ] };

-    key <AE10> {         [               0,      asciitilde ] };

-    key <AE11> {         [           minus,           equal ] };

-    key <AE12> {         [     asciicircum,         overbar ] };

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

-

-    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard

-    key <AD11> {         [              at,           grave ] };

-    key <AD12> {         [     bracketleft,       braceleft ] };

-

-    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };

-    // keys <AC01> - <AC09> are identical to US/ASCII keyboard

-    key <AC10> {         [       semicolon,            plus ] };

-    key <AC11> {         [           colon,        asterisk ] };

-    key <AC12> {         [    bracketright,      braceright ] };

-

-    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard

-    key <AB11> {         [       backslash,      underscore ] };

-

-    key <NFER> {         [        Muhenkan ] };

-    key <XFER> {         [           Kanji ] };

-    key <HKTG> {         [ Hiragana_Katakana ] };

-};

-

-xkb_symbols "alternate106" {

-    key <AE10> {         [               0,      overbar ] };

-    key <AE12> {         [     asciicircum,      asciitilde] };

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

-    key <AB11> {         [        underbar,      underscore ] };

-    augment "sgi/jp(jp106)"

-};

+xkb_symbols "jp106" {
+
+    name[group1]="Japan/ASCII";
+
+    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };
+    key <AE01> {         [               1,          exclam ] };
+    key <AE02> {         [               2,        quotedbl ] };
+    key <AE03> {         [               3,      numbersign ] };
+    key <AE04> {         [               4,          dollar ] };
+    key <AE05> {         [               5,         percent ] };
+    key <AE06> {         [               6,       ampersand ] };
+    key <AE07> {         [               7,      apostrophe ] };
+    key <AE08> {         [               8,       parenleft ] };
+    key <AE09> {         [               9,      parenright ] };
+    key <AE10> {         [               0,      asciitilde ] };
+    key <AE11> {         [           minus,           equal ] };
+    key <AE12> {         [     asciicircum,         overbar ] };
+    key <AE13> {         [             yen,             bar ] };
+
+    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard
+    key <AD11> {         [              at,           grave ] };
+    key <AD12> {         [     bracketleft,       braceleft ] };
+
+    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };
+    // keys <AC01> - <AC09> are identical to US/ASCII keyboard
+    key <AC10> {         [       semicolon,            plus ] };
+    key <AC11> {         [           colon,        asterisk ] };
+    key <AC12> {         [    bracketright,      braceright ] };
+
+    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard
+    key <AB11> {         [       backslash,      underscore ] };
+
+    key <NFER> {         [        Muhenkan ] };
+    key <XFER> {         [           Kanji ] };
+    key <HKTG> {         [ Hiragana_Katakana ] };
+};
+
+xkb_symbols "alternate106" {
+    key <AE10> {         [               0,      overbar ] };
+    key <AE12> {         [     asciicircum,      asciitilde] };
+    key <AE13> {         [       backslash,             bar ] };
+    key <AB11> {         [        underbar,      underscore ] };
+    augment "sgi/jp(jp106)"
+};