diff options
author | marha <marha@users.sourceforge.net> | 2010-02-28 16:19:32 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-28 16:19:32 +0000 |
commit | 6f73cad956de465042319277551264829856faa2 (patch) | |
tree | ab9750afe0e6b7451396296ce5793986061cad05 /include | |
parent | 61b8b4249d504d00ad88444e49dfb835737e7ed9 (diff) | |
parent | 03ca670131e8e32c2aad3e5718dcebf37925072a (diff) | |
download | vcxsrv-6f73cad956de465042319277551264829856faa2.tar.gz vcxsrv-6f73cad956de465042319277551264829856faa2.tar.bz2 vcxsrv-6f73cad956de465042319277551264829856faa2.zip |
svn merge ^/branches/released .
Diffstat (limited to 'include')
-rw-r--r-- | include/dix-config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dix-config.h b/include/dix-config.h index 53cbd31ba..7545b846a 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -24,7 +24,7 @@ #define BUILDERSTRING "" /* Default font path */ -#define COMPILEDDEFAULTFONTPATH "fonts/misc/,fonts/TTF/,fonts/OTF,fonts/Type1/,fonts/100dpi/,fonts/75dpi/,fonts/cyrillic/,fonts/Speedo/,built-ins" +#define COMPILEDDEFAULTFONTPATH "fonts/misc/,fonts/TTF/,fonts/OTF,fonts/Type1/,fonts/100dpi/,fonts/75dpi/,fonts/cyrillic/,fonts/Speedo/,fonts/terminus-font/,built-ins" /* Miscellaneous server configuration files path */ #define SERVER_MISC_CONFIG_PATH "." |