]> xenbits.xensource.com Git - qemu-xen-4.2-testing.git/commitdiff
Merge branch 'master' of ../qemu-iwj
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 22 Oct 2008 16:46:08 +0000 (17:46 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 22 Oct 2008 16:46:08 +0000 (17:46 +0100)
1  2 
hw/cirrus_vga.c
hw/vga_int.h

diff --cc hw/cirrus_vga.c
Simple merge
diff --cc hw/vga_int.h
Simple merge