vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into asprintf

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-20 08:06:28 +01:00
commit 14284856a2
5 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/grub/font.h
View file

@ -75,8 +75,7 @@ void grub_font_loader_init (void);
/* Load a font and add it to the beginning of the global font list.
Returns: 0 upon success; nonzero upon failure. */
int
grub_font_load (const char *filename);
int grub_font_load (const char *filename);
/* Get the font that has the specified name. Font names are in the form
"Family Name Bold Italic 14", where Bold and Italic are optional.

1
include/grub/x86_64/at_keyboard.h Normal file
View file

@ -0,0 +1 @@
#include <grub/i386/at_keyboard.h>