| commit | 13856f17ce790737b928961b7fb5a3adddc95124 | |
| 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 | 8e41ccd64029c5e90e1493b76cd8b5cecacb0884 | treesnapshot (tar.gz zip) |
| parent | b529bc6d2238b4d3d80a1bfc8d728ca28b9b7d89 | commitdiff |
| parent | 1addc7c5a11e9fe1811c792614516ed12689a1f0 | 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: