| commit | da17c8501b5829a7745937341cc1881f53971208 | |
| author | Avi Kivity <avi@qumranet.com> | |
| Wed, 25 Jun 2008 13:17:36 +0000 (25 16:17 +0300) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Wed, 25 Jun 2008 13:17:36 +0000 (25 16:17 +0300) | ||
| tree | a094ad030d3490a9799697a661df0859760b12a1 | treesnapshot (tar.gz zip) |
| parent | ccde0f40bcdf553df1f7aeb72b5f33773ea32938 | commitdiff |
| parent | ebbd0ffddd67e70180235561b150aa02897992b1 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-defs.h
qemu/cutils.c
qemu/exec-all.h
qemu/exec.c
qemu/monitor.c
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-defs.h
qemu/cutils.c
qemu/exec-all.h
qemu/exec.c
qemu/monitor.c
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
21 files changed: