| commit | 6e0f4d4f4a83b926e7281af4083657af8b1e7e75 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 1 Dec 2008 16:51:57 +0000 (1 18:51 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 1 Dec 2008 16:51:57 +0000 (1 18:51 +0200) | ||
| tree | 79a03ca089abefc54829094a7848cf70f9ac7fc6 | treesnapshot (tar.gz zip) |
| parent | 82daa70a1d5bcad3a93150ffc5afbcb9e77361fb | commitdiff |
| parent | 521bb6c94751ebc915623426238f8ca59e95e0f6 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/block.c
qemu/configure
qemu/exec.c
qemu/hw/cirrus_vga.c
qemu/hw/ide.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/Makefile
qemu/block.c
qemu/configure
qemu/exec.c
qemu/hw/cirrus_vga.c
qemu/hw/ide.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
22 files changed: