diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
| commit | 24fb0da18f1c44dfa1f76d8cde8efbb958aa7659 (patch) | |
| tree | 76157bb2f88c9383b0824476a9e3a9f9a1bff9fa /xorg-server/dix/dixfonts.c | |
| parent | 6876c31f186414ce975180af79902314c8cdc82a (diff) | |
| parent | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (diff) | |
| download | vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.gz vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.bz2 vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/glext.h
xorg-server/.gitignore
xorg-server/glx/glxext.c
Diffstat (limited to 'xorg-server/dix/dixfonts.c')
| -rw-r--r-- | xorg-server/dix/dixfonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 49758d5b5..b55e519a3 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -1695,7 +1695,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist) err = (*fpe_functions[fpe->type].init_fpe) (fpe); if (err != Successful) { if (persist) { - ErrorF + DebugF ("[dix] Could not init font path element %s, removing from list!\n", fpe->name); } |