diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-01 19:23:13 +0000 |
| commit | 5030d911084584f9b37aeaa916ab43130044edbf (patch) | |
| tree | 0f0e400aa2c575c3fcdfcceaa6012d2f760e525e /navit/font | |
| parent | 449e5530c4ee68f77691c811f0670cf90e9e58a4 (diff) | |
| parent | 59bbe485ba74a6df5ec944275ae28fc1bd98981e (diff) | |
| download | navit-5030d911084584f9b37aeaa916ab43130044edbf.tar.gz | |
Merge branch 'trunk' into trac/1341trac/1341
Conflicts:
navit/Makefile.am
navit/xpm/Makefile.am
po/Makefile.am
Diffstat (limited to 'navit/font')
| -rw-r--r-- | navit/font/freetype/font_freetype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c index f41eff314..0508c5870 100644 --- a/navit/font/freetype/font_freetype.c +++ b/navit/font/freetype/font_freetype.c @@ -658,7 +658,7 @@ font_freetype_new(void *meth) void plugin_init(void) { - plugin_register_font_type("freetype", font_freetype_new); + plugin_register_category_font("freetype", font_freetype_new); #ifdef HAVE_FONTCONFIG FcInit(); #endif |