diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
| commit | 04f3d1515878e535b7e3876264eaa4d43a1e6d54 (patch) | |
| tree | 58867d9fa0097be91f1717a693a7ca4b3eb77d71 /libX11/modules/om | |
| parent | ff986553659472cf191804eadb13c21e8f2b44c0 (diff) | |
| parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
| download | vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.gz vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.bz2 vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver git update 29 July 2013
Diffstat (limited to 'libX11/modules/om')
| -rw-r--r-- | libX11/modules/om/generic/omGeneric.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/modules/om/generic/omGeneric.c b/libX11/modules/om/generic/omGeneric.c index d34928784..301b6a0e8 100644 --- a/libX11/modules/om/generic/omGeneric.c +++ b/libX11/modules/om/generic/omGeneric.c @@ -1164,7 +1164,7 @@ parse_fontname( * a "missing_charset" will be reported to the client * for this CharSet. */ - font_data_return. xlfd_name = NULL; + font_data_return.xlfd_name = NULL; font_data_return.side = XlcUnknown; ret = parse_fontdata(oc, font_set, font_set->font_data, |