diff options
| author | Avi Kivity <avi@qumranet.com> | 2008-06-05 15:19:41 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-06-05 15:19:41 +0300 |
| commit | eb2fd67cbecdb573f908697ed41b81ee312372bd (patch) | |
| tree | 017be945a110a2ca2c63f5c37f08e4a542bb4d40 /configure | |
| parent | 4e8b8a6d92c5ece048e65be3a3980d24f065b32b (diff) | |
| parent | 1a1d609590f50bf307e9136e03e53b6fd871a7b1 (diff) | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/apic.c
qemu/hw/boards.h
qemu/hw/pc.c
qemu/monitor.c
qemu/sysemu.h
qemu/target-i386/cpu.h
qemu/target-i386/helper2.c
qemu/target-i386/machine.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions