]> xenbits.xensource.com Git - qemu-xen-4.6-testing.git/commit
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)
commitcff419c117b55c35b2f950be035ba2b2044a9065
tree7d710500be71be26a84f49d1063171c7015cf8e4
parent56138900c85eb6b65c345b7b85d8fb374c6bdd1c
parentea324bf41565322b370b27253b1a7eaa3cc360b9
Merge branch 'master' of ../qemu-iwj
hw/cirrus_vga.c
hw/vga_int.h