| commit | 57d4322c2e8f7796d3d63041840efe65acd83cd2 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Dec 2008 13:41:44 +0000 (23 15:41 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Dec 2008 13:41:44 +0000 (23 15:41 +0200) | ||
| tree | f135a8f1ae34e0abd0c30441577800d4e5447334 | treesnapshot (tar.gz zip) |
| parent | e9fd09f26754d4872d5c78bab9bb6d7c98e77809 | commitdiff |
| parent | 19a12c5b118edb3ca6da4d9717b9fc8108cd69ba | commitdiff |
Merge branch 'vgabios-cvs'
Conflicts:
qemu/pc-bios/vgabios-cirrus.bin
qemu/pc-bios/vgabios.bin
vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
vgabios/VGABIOS-lgpl-latest.debug.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/pc-bios/vgabios-cirrus.bin
qemu/pc-bios/vgabios.bin
vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
vgabios/VGABIOS-lgpl-latest.debug.bin
Signed-off-by: Avi Kivity <avi@redhat.com>