]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/commit
Merge branch 'qemu'
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 22 Oct 2008 17:17:08 +0000 (18:17 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 22 Oct 2008 17:17:08 +0000 (18:17 +0100)
commitacc42d6748871a25f099a7e2272f1747bf7c995a
tree5610dd9103aaec64d1663ea7f4a92f4cc32aef8b
parentcff419c117b55c35b2f950be035ba2b2044a9065
parent66ac44284e4cd259cb97f88d4fe732d96cd1694f
Merge branch 'qemu'

Conflicts:

block.c
hw/scsi-disk.c
vl.c
Makefile.target
block-raw-posix.c
block.c
configure
hw/scsi-disk.c
hw/vga.c
monitor.c
sysemu.h
vl.c