aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/armscii-8/XLC_LOCALE.pre
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-19 10:38:33 +0100
committermarha <marha@users.sourceforge.net>2012-11-19 10:38:33 +0100
commit24635abae6008bef13e30d798b3f33abab412770 (patch)
treee799fbde24e0fd935af76b0bc48d30ef69f75d54 /libX11/nls/armscii-8/XLC_LOCALE.pre
parente0844ae8b5ef87049537a7e0ebff81acc2695256 (diff)
parent6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff)
downloadvcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz
vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2
vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip
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
Diffstat (limited to 'libX11/nls/armscii-8/XLC_LOCALE.pre')
-rw-r--r--libX11/nls/armscii-8/XLC_LOCALE.pre158
1 files changed, 79 insertions, 79 deletions
diff --git a/libX11/nls/armscii-8/XLC_LOCALE.pre b/libX11/nls/armscii-8/XLC_LOCALE.pre
index 258ce257d..72013f711 100644
--- a/libX11/nls/armscii-8/XLC_LOCALE.pre
+++ b/libX11/nls/armscii-8/XLC_LOCALE.pre
@@ -1,79 +1,79 @@
-XCOMM XLocale Database Sample for armscii-8.
-XCOMM
-
-XCOMM
-XCOMM XLC_FONTSET category
-XCOMM
-XLC_FONTSET
-XCOMM fs0 class (7 bit ASCII)
-fs0 {
- charset {
- name ISO8859-1:GL
- }
- font {
- primary ARMSCII-8:GL
- substitute ISO8859-1:GL
- }
-}
-XCOMM fs1 class
-fs1 {
- charset ARMSCII-8:GR
- font ARMSCII-8:GR
-}
-END XLC_FONTSET
-
-XCOMM
-XCOMM XLC_CHARSET_DEFINE category
-XCOMM
-XLC_CHARSET_DEFINE
-csd0 {
- charset_name ARMSCII-8
- side GR
- length 1
- string_encoding False
- sequence \x1b%/1
-}
-END XLC_CHARSET_DEFINE
-
-XCOMM
-XCOMM XLC_XLOCALE category
-XCOMM
-XLC_XLOCALE
-
-encoding_name ARMSCII-8
-mb_cur_max 1
-state_depend_encoding False
-#if WCHAR32
-wc_encoding_mask \x30000000
-wc_shift_bits 7
-#else
-wc_encoding_mask \x00008080
-wc_shift_bits 8
-#endif
-
-#ifndef X_LOCALE
-use_stdc_env True
-#endif
-
-XCOMM cs0 class
-cs0 {
- side GL:Default
- length 1
- wc_encoding \x00000000
- ct_encoding ARMSCII-8:GL; ISO8859-1:GL
-}
-
-
-XCOMM cs1 class
-cs1 {
- side GR:Default
- length 1
-#if WCHAR32
- wc_encoding \x30000000
-#else
- wc_encoding \x00008080
-#endif
- ct_encoding ARMSCII-8:GR
-}
-
-END XLC_XLOCALE
+XCOMM XLocale Database Sample for armscii-8.
+XCOMM
+
+XCOMM
+XCOMM XLC_FONTSET category
+XCOMM
+XLC_FONTSET
+XCOMM fs0 class (7 bit ASCII)
+fs0 {
+ charset {
+ name ISO8859-1:GL
+ }
+ font {
+ primary ARMSCII-8:GL
+ substitute ISO8859-1:GL
+ }
+}
+XCOMM fs1 class
+fs1 {
+ charset ARMSCII-8:GR
+ font ARMSCII-8:GR
+}
+END XLC_FONTSET
+
+XCOMM
+XCOMM XLC_CHARSET_DEFINE category
+XCOMM
+XLC_CHARSET_DEFINE
+csd0 {
+ charset_name ARMSCII-8
+ side GR
+ length 1
+ string_encoding False
+ sequence \x1b%/1
+}
+END XLC_CHARSET_DEFINE
+
+XCOMM
+XCOMM XLC_XLOCALE category
+XCOMM
+XLC_XLOCALE
+
+encoding_name ARMSCII-8
+mb_cur_max 1
+state_depend_encoding False
+#if WCHAR32
+wc_encoding_mask \x30000000
+wc_shift_bits 7
+#else
+wc_encoding_mask \x00008080
+wc_shift_bits 8
+#endif
+
+#ifndef X_LOCALE
+use_stdc_env True
+#endif
+
+XCOMM cs0 class
+cs0 {
+ side GL:Default
+ length 1
+ wc_encoding \x00000000
+ ct_encoding ARMSCII-8:GL; ISO8859-1:GL
+}
+
+
+XCOMM cs1 class
+cs1 {
+ side GR:Default
+ length 1
+#if WCHAR32
+ wc_encoding \x30000000
+#else
+ wc_encoding \x00008080
+#endif
+ ct_encoding ARMSCII-8:GR
+}
+
+END XLC_XLOCALE