diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
| commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
| tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /fontconfig | |
| parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
| parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
| download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/conf.d/30-metric-aliases.conf | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf index 08c8ba328..49a960247 100644 --- a/fontconfig/conf.d/30-metric-aliases.conf +++ b/fontconfig/conf.d/30-metric-aliases.conf @@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps: </default> </alias> -<!-- - Due to Bug#73291, commented out those lines until the broken font are fixed. <alias binding="same"> <family>TeX Gyre Termes</family> <default> <family>Times</family> </default> </alias> ---> <alias binding="same"> <family>Nimbus Mono L</family> @@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps: <alias binding="same"> <family>Times</family> <accept> -<!-- - Due to Bug#73291, commented out this line until the broken font are fixed. <family>TeX Gyre Termes</family> ---> <family>Nimbus Roman No9 L</family> </accept> </alias> |