| commit | 156f167ff4bcef2b7de690265a83e301ce411785 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 13 Nov 2008 13:52:40 +0000 (13 15:52 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 13 Nov 2008 13:52:40 +0000 (13 15:52 +0200) | ||
| tree | 5c37ed475e83db1cae71959392e50b0301b337e6 | treesnapshot (tar.gz zip) |
| parent | 854545e63f9d48fbc4d3595b0ffe73a950ce646f | commitdiff |
| parent | 8ad9fa5d8be7fd04e723020088eca664971eb363 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/osdep.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/osdep.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
15 files changed: