diff options
author | marha <marha@users.sourceforge.net> | 2013-02-01 09:35:49 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-01 09:35:49 +0100 |
commit | d78d8436d799f19f61642849e31e9ed6af3e6ae2 (patch) | |
tree | 436d3d26ae0fe678e3751a9dba65162ac54b2597 /fontconfig/fonts.dtd | |
parent | 49c196c1056aaed97ff5cf43beff5c436d783b99 (diff) | |
parent | a6d5f8de1394c338d01b65be7dba3520bf8bdf4b (diff) | |
download | vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.gz vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.tar.bz2 vcxsrv-d78d8436d799f19f61642849e31e9ed6af3e6ae2.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkeyboard-config fontconfig mesa git update 1 feb 2013
Diffstat (limited to 'fontconfig/fonts.dtd')
-rw-r--r-- | fontconfig/fonts.dtd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd index def8c216f..4c38e77f0 100644 --- a/fontconfig/fonts.dtd +++ b/fontconfig/fonts.dtd @@ -140,7 +140,7 @@ if 'target' is 'font', execute the match on the result of a font selection. --> -<!ELEMENT match (test*, edit*)> +<!ELEMENT match (test*, edit*)+> <!ATTLIST match target (pattern|font|scan) "pattern"> @@ -189,7 +189,7 @@ <!ELEMENT edit (%expr;)*> <!ATTLIST edit name CDATA #REQUIRED - mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign" + mode (assign|assign_replace|prepend|append|prepend_first|append_last|delete|delete_all) "assign" binding (weak|strong|same) "weak"> <!-- |