aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-25 08:09:35 +0000
committermarha <marha@users.sourceforge.net>2010-06-25 08:09:35 +0000
commit33ffba2e91f46fed9e98d82d3db52b443fb49d9b (patch)
tree03db1d562b43892e14b1cd00233669ad3ce82fa7 /xorg-server/dix
parent345335d61c71c245846d679d568a8b5eca1a5ca9 (diff)
parent65fee5533a4cec1d9c1ec631f9cb98f09cf638cf (diff)
downloadvcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.gz
vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.tar.bz2
vcxsrv-33ffba2e91f46fed9e98d82d3db52b443fb49d9b.zip
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/dixfonts.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 1cc5a9161..3f4baf6cb 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1926,9 +1926,7 @@ InitFonts (void)
{
patternCache = MakeFontPatternCache();
- BuiltinRegisterFpeFunctions();
- FontFileRegisterFpeFunctions();
- fs_register_fpe_functions();
+ register_fpe_functions();
}
int