diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /libX11/nls/microsoft-cp1251/XLC_LOCALE.pre | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-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/microsoft-cp1251/XLC_LOCALE.pre')
| -rw-r--r-- | libX11/nls/microsoft-cp1251/XLC_LOCALE.pre | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre b/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre index 77b9cd26e..c96d90858 100644 --- a/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre +++ b/libX11/nls/microsoft-cp1251/XLC_LOCALE.pre @@ -56,10 +56,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 { |