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

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

projects / xenclient / ioemu.git / commit

author	Ian Jackson <ian.jackson@eu.citrix.com>
	Thu, 12 Mar 2009 19:18:57 +0000 (19:18 +0000)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Thu, 12 Mar 2009 19:18:57 +0000 (19:18 +0000)
commit	00b80c9f1183462c3015f9666ef68e588acd2c85
tree	63b4689d44c58edb2ee7e37f47fbb810b115c628	tree
parent	68f28fc19f111ff1b4f6918d352932ca2291f949	commit \| diff
parent	f586ce09e22e9b9b264f1acd7e5f24dd5de7233b	commit \| diff

Merge branch 'upstream'

Conflicts:

.gitignore
Makefile.target
block-vpc.c
console.c
console.h
hw/cirrus_vga.c
hw/ide.c
hw/pc.c
hw/pc.h
hw/pci.h
hw/vga.c
hw/vga_int.h
sdl.c
target-ppc/translate_init.c
vl.c
vnc.c

48 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vpc.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
block.h	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
console.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cutils.c	diff1 \|	diff2 \|	blob \| history
darwin-user/machload.c	diff1 \|	diff2 \|	blob \| history
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mips_mipssim.c	diff1 \|	diff2 \|	blob \| history
hw/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pcnet.c	diff1 \|	diff2 \|	blob \| history
hw/piix_pci.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
hw/vga_int.h	diff1 \|	diff2 \|	blob \| history
hw/vmware_vga.c	diff1 \|	diff2 \|	blob \| history
hw/xen_machine_fv.c	diff1 \|	\|	blob \| history
hw/xen_machine_pv.c	diff1 \|	\|	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
qemu-common.h	diff1 \|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnchextile.h	diff1 \|	diff2 \|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history

xenclient ioemu repository

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vpc.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
block.h	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
console.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cutils.c	diff1 \|	diff2 \|	blob \| history
darwin-user/machload.c	diff1 \|	diff2 \|	blob \| history
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mips_mipssim.c	diff1 \|	diff2 \|	blob \| history
hw/mips_r4k.c	diff1 \|	diff2 \|	blob \| history
hw/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pcnet.c	diff1 \|	diff2 \|	blob \| history
hw/piix_pci.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
hw/vga_int.h	diff1 \|	diff2 \|	blob \| history
hw/vmware_vga.c	diff1 \|	diff2 \|	blob \| history
hw/xen_machine_fv.c	diff1 \|	\|	blob \| history
hw/xen_machine_pv.c	diff1 \|	\|	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
qemu-common.h	diff1 \|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnchextile.h	diff1 \|	diff2 \|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history