diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-08-05 12:58:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2010-08-05 12:58:59 +0200 |
| commit | 12242a37d8eef68ba19776c9f5b1606843f3c236 (patch) | |
| tree | fee4afd414788d2f232da1a99b5a323a616ada4f /pc-bios | |
| parent | 59d71ddb432db04b57ee2658ce50a3e35d7db97e (diff) | |
| parent | 91db0417ac64255a297d88543bc91b439a48c013 (diff) | |
Merge remote branch 'kraxel/spice.v14' into spice.kvm.v14spice.kvm.v14.spicevmc
Conflicts:
Makefile.target
configure
hw/pc.c
monitor.c
pc-bios/vgabios-cirrus.bin
pc-bios/vgabios.bin
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 35840 -> 35840 bytes |
| -rw-r--r-- | pc-bios/vgabios-qxl.bin | bin | 0 -> 40448 bytes |
| -rw-r--r-- | pc-bios/vgabios-qxldev.bin | bin | 0 -> 40448 bytes |
| -rw-r--r-- | pc-bios/vgabios-stdvga.bin | bin | 0 -> 40448 bytes |
| -rw-r--r-- | pc-bios/vgabios-vmware.bin | bin | 0 -> 40448 bytes |
| -rw-r--r-- | pc-bios/vgabios.bin | bin | 39936 -> 40448 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin Binary files differindex 7007bf093..ffd37d8a6 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin Binary files differnew file mode 100644 index 000000000..2732d5599 --- /dev/null +++ b/pc-bios/vgabios-qxl.bin diff --git a/pc-bios/vgabios-qxldev.bin b/pc-bios/vgabios-qxldev.bin Binary files differnew file mode 100644 index 000000000..83e2161fb --- /dev/null +++ b/pc-bios/vgabios-qxldev.bin diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin Binary files differnew file mode 100644 index 000000000..6ec49fec5 --- /dev/null +++ b/pc-bios/vgabios-stdvga.bin diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin Binary files differnew file mode 100644 index 000000000..76173c2ec --- /dev/null +++ b/pc-bios/vgabios-vmware.bin diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin Binary files differindex c38c62ae3..1d94417ee 100644 --- a/pc-bios/vgabios.bin +++ b/pc-bios/vgabios.bin |