]> git.proxmox.com Git - grub2.git/commit
merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Wed, 18 May 2011 15:53:36 +0000 (16:53 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Wed, 18 May 2011 15:53:36 +0000 (16:53 +0100)
commite806ce60eeac7ef2303e47aebae4e744bdc505cc
tree5d6de6c362e58ff93359ee6d990e9eaed4b745ee
parent421284f2998aa3e9134372379a2bd03de08a2740
parent8b63a142977cf48d33fd5486a8afeac9de78aca4
merge trunk
docs/grub.texi
grub-core/commands/videoinfo.c
grub-core/video/i386/pc/vbe.c
grub-core/video/video.c
include/grub/video.h
util/grub.d/00_header.in