Merge mainline into emu-mod

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-14 16:27:54 +01:00
commit dae79b6b05
89 changed files with 1882 additions and 893 deletions

View file

@ -862,7 +862,7 @@ grub_font_get (const char *font_name)
return &null_font;
}
/* Get the full name of the font. For instance, "Helvetica Bold 12". */
/* Get the full name of the font. */
const char *
grub_font_get_name (grub_font_t font)
{