xenbits.xen.org Git - xenclient/ioemu.git/commit

]> xenbits.xen.org Git - xenclient/ioemu.git/commit

projects / xenclient / ioemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4f47bcf 8bb66d8)

author	Ian Jackson <ian.jackson@eu.citrix.com>
	Tue, 14 Apr 2009 16:35:05 +0000 (17:35 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Tue, 14 Apr 2009 16:35:05 +0000 (17:35 +0100)
commit	baf8c0bc4bee8cacb089d5d635f41eebb23f084c
tree	528e171323439c9add58cb4df02430ee48e21fcf	tree
parent	4f47bcf1ad49ef168df8d0e89843da3059a88e87	commit \| diff
parent	8bb66d860148958cb48144f0c5e2dcaaa209a3cd	commit \| diff

Merge branch 'stable_0_10'

Conflicts:

block.c
hw/cirrus_vga.c
hw/vga.c

18 files changed:

block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-win32.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
block.h	diff1 \|	diff2 \|	blob \| history
block_int.h	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-char.h	diff1 \|	diff2 \|	blob \| history
savevm.c	diff1 \|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

xenclient ioemu repository