| commit | 1c154017c6d09f468159b6984a0213268fd3ea41 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 8 Jan 2009 12:50:23 +0000 (8 14:50 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 8 Jan 2009 12:58:57 +0000 (8 14:58 +0200) | ||
| tree | 15f5a956fb6fd583a7203a4c61c2a1824c7e3cf6 | treesnapshot (tar.gz zip) |
| parent | b1fa76d70491e426646459827ebe2bf863f8209a | commitdiff |
| parent | 13e4e059ae110db6e3dae3165d8054a638e47bd7 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/net.c
qemu/net.h
qemu/qemu-doc.texi
qemu/sysemu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/net.c
qemu/net.h
qemu/qemu-doc.texi
qemu/sysemu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
16 files changed: