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, 2 Apr 2009 12:51:27 +0000 (13:51 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Thu, 2 Apr 2009 12:51:27 +0000 (13:51 +0100)
commit	3057543e17321221e7bbccd974a33237c3ee92c2
tree	6558d0329c850903bd473c20b83560190b05d3eb	tree
parent	0fdbb4698e4df3adc478041b11cee63436713a14	commit \| diff
parent	b4171e4b79d5be97ee0d1516aab321f32a3aca1a	commit \| diff

Merge tag 'stable_0_10_0.branchpoint'

Conflicts:

Makefile.target
block-bochs.c
block-cloop.c
block-parallels.c
block.c
console.c
console.h
hw/ide.c
hw/pc.c
hw/pci.c
hw/pci.h
hw/usb-hid.c
hw/vga.c
loader.c
net.h
posix-aio-compat.c
vl.c
vnc.c

55 files changed:

Makefile.target	diff1 \|	diff2 \|	blob \| history
aio.c	diff1 \|	diff2 \|	blob \| history
block-bochs.c	diff1 \|	diff2 \|	blob \| history
block-cloop.c	diff1 \|	diff2 \|	blob \| history
block-dmg.c	diff1 \|	diff2 \|	blob \| history
block-parallels.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vmdk.c	diff1 \|	diff2 \|	blob \| history
block-vpc.c	diff1 \|	diff2 \|	blob \| history
block-vvfat.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.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cpu-all.h	diff1 \|	diff2 \|	blob \| history
curses.c	diff1 \|	diff2 \|	blob \| history
cutils.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/iommu.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mc146818rtc.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/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/usb-hid.c	diff1 \|	diff2 \|	blob \| history
keymaps.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
migration-exec.c	diff1 \|	diff2 \|	blob \| history
migration-tcp.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net.c	diff1 \|	diff2 \|	blob \| history
net.h	diff1 \|	diff2 \|	blob \| history
posix-aio-compat.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
savevm.c	diff1 \|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc_keysym.h	diff1 \|	diff2 \|	blob \| history

xenclient ioemu repository

RSS Atom

Makefile.target	diff1 \|	diff2 \|	blob \| history
aio.c	diff1 \|	diff2 \|	blob \| history
block-bochs.c	diff1 \|	diff2 \|	blob \| history
block-cloop.c	diff1 \|	diff2 \|	blob \| history
block-dmg.c	diff1 \|	diff2 \|	blob \| history
block-parallels.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vmdk.c	diff1 \|	diff2 \|	blob \| history
block-vpc.c	diff1 \|	diff2 \|	blob \| history
block-vvfat.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.c	diff1 \|	diff2 \|	blob \| history
console.h	diff1 \|	diff2 \|	blob \| history
cpu-all.h	diff1 \|	diff2 \|	blob \| history
curses.c	diff1 \|	diff2 \|	blob \| history
cutils.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/iommu.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/mc146818rtc.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/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/serial.c	diff1 \|	diff2 \|	blob \| history
hw/sun4u.c	diff1 \|	diff2 \|	blob \| history
hw/usb-hid.c	diff1 \|	diff2 \|	blob \| history
keymaps.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
migration-exec.c	diff1 \|	diff2 \|	blob \| history
migration-tcp.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
net.c	diff1 \|	diff2 \|	blob \| history
net.h	diff1 \|	diff2 \|	blob \| history
posix-aio-compat.c	diff1 \|	diff2 \|	blob \| history
qemu-char.c	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
savevm.c	diff1 \|	diff2 \|	blob \| history
sdl.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc_keysym.h	diff1 \|	diff2 \|	blob \| history