| commit | f47cf194fa64c6241eb2b898b4706e0ce3729bf7 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 1 Oct 2008 10:28:50 +0000 (1 13:28 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 1 Oct 2008 10:28:50 +0000 (1 13:28 +0300) | ||
| tree | 474e2b033f8889c9806a41f2a104d4ff3c655a10 | treesnapshot (tar.gz zip) |
| parent | 841d7ec68d29ca38262757dddcfce146bbdd1443 | commitdiff |
| parent | d1412eb2406bf3dea8598783f3eb5a9b5f3166bb | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/hw/hw.h
qemu/hw/vga.c
qemu/hw/vga_int.h
qemu/target-i386/cpu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/hw/hw.h
qemu/hw/vga.c
qemu/hw/vga_int.h
qemu/target-i386/cpu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
23 files changed: