aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/iso8859-6
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
committermarha <marha@users.sourceforge.net>2013-11-25 12:10:25 +0100
commit0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch)
tree8239768e506a03837019c4f02c8ab949c04a0818 /libX11/nls/iso8859-6
parent7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff)
parenta473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff)
downloadvcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2
vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013 Conflicts: libXinerama/src/Xinerama.c
Diffstat (limited to 'libX11/nls/iso8859-6')
-rw-r--r--libX11/nls/iso8859-6/XLC_LOCALE.pre2
1 files changed, 0 insertions, 2 deletions
diff --git a/libX11/nls/iso8859-6/XLC_LOCALE.pre b/libX11/nls/iso8859-6/XLC_LOCALE.pre
index 5b0d4d4a5..c2a5107f7 100644
--- a/libX11/nls/iso8859-6/XLC_LOCALE.pre
+++ b/libX11/nls/iso8859-6/XLC_LOCALE.pre
@@ -43,10 +43,8 @@ wc_encoding_mask \x00008080
wc_shift_bits 8
#endif
-#ifndef X_LOCALE
use_stdc_env True
force_convert_to_mb True
-#endif
XCOMM cs0 class
cs0 {