Merge mainline into cleanbuild

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-03-14 16:01:31 +01:00
commit 016a671b51
89 files changed
+1402 -929

No files matched your search

+2 -2
View File
@@ -59,8 +59,8 @@ find_display (void)
{
if (grub_strcmp (alias->type, "display") == 0)
{
grub_dprintf ("video", "Found display %s\n", alias->name);
display = grub_strdup (alias->name);
grub_dprintf ("video", "Found display %s\n", alias->path);
display = grub_strdup (alias->path);
return 1;
}
return 0;