diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
| commit | 6231dd66fec697922b164ec03731f04542c2b30e (patch) | |
| tree | 83bfa2dec8ba2d32860d513b7816dae412712fa5 /fontconfig/fonts.conf.in | |
| parent | 58780b4306bd1254c6c0e65d255630d5c546005f (diff) | |
| parent | 13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (diff) | |
| download | vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.gz vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.bz2 vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'fontconfig/fonts.conf.in')
| -rw-r--r-- | fontconfig/fonts.conf.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fontconfig/fonts.conf.in b/fontconfig/fonts.conf.in index 533381b9d..8f9fb8823 100644 --- a/fontconfig/fonts.conf.in +++ b/fontconfig/fonts.conf.in @@ -34,7 +34,7 @@ <test qual="any" name="family"> <string>mono</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>monospace</string> </edit> </match> @@ -46,7 +46,7 @@ <test qual="any" name="family"> <string>sans serif</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -58,7 +58,7 @@ <test qual="any" name="family"> <string>sans</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> |