xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit

]> xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit

projects / qemu-xen-3.4-testing.git / commit

author	Ian Jackson <ian.jackson@eu.citrix.com>
	Wed, 22 Oct 2008 16:45:28 +0000 (17:45 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Wed, 22 Oct 2008 16:45:28 +0000 (17:45 +0100)
commit	56138900c85eb6b65c345b7b85d8fb374c6bdd1c
tree	cd712ddcbc6b1297206ed0a65bf543a749a7ab29	tree
parent	46be40c676ae4ab30debdebbbd6162246a9cbba0	commit \| diff
parent	3df1a17b0ab8a8be4e3c9d6b2fa0812c652520f1	commit \| diff

Merge branch 'qemu'

Conflicts:

Makefile
audio/sys-queue.h
block-cow.c
block-raw-posix.c
configure
console.c
console.h
exec-all.h
hw/cirrus_vga.c
hw/ide.c
hw/ne2000.c
hw/pc.c
hw/pcnet.c
hw/rtl8139.c
hw/scsi-disk.c
hw/serial.c
hw/usb-hid.c
hw/usb-uhci.c
hw/vga.c
monitor.c
sdl.c
vl.c
vnc.c
vnc_keysym.h
vnchextile.h

53 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
audio/mixeng.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block.c	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
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/dma.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/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pass-through.h	diff1 \|	\|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pcnet.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/usb-hid.c	diff1 \|	diff2 \|	blob \| history
hw/usb-uhci.c	diff1 \|	diff2 \|	blob \| history
hw/usb.h	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
i386-dm/cpu.h	diff1 \|	\|	blob \| history
i386-dm/exec-dm.c	diff1 \|	\|	blob \| history
i386-dm/hookslib.mak	diff1 \|	\|	blob \| history
keymaps.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
qemu-char.h	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-lock.h	\|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
tests/Makefile	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnc_keysym.h	diff1 \|	diff2 \|	blob \| history
xen-config-host.h	diff1 \|	\|	blob \| history
xen-config-host.mak	diff1 \|	\|	blob \| history
xen-hooks.mak	diff1 \|	\|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history
xenstore.c	diff1 \|	\|	blob \| history

Obsolete Qemu-dm 3.4 stable branch

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
audio/mixeng.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block.c	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
exec-all.h	diff1 \|	diff2 \|	blob \| history
hw/boards.h	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/dma.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/ne2000.c	diff1 \|	diff2 \|	blob \| history
hw/pass-through.h	diff1 \|	\|	blob \| history
hw/pc.c	diff1 \|	diff2 \|	blob \| history
hw/pc.h	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pcnet.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/usb-hid.c	diff1 \|	diff2 \|	blob \| history
hw/usb-uhci.c	diff1 \|	diff2 \|	blob \| history
hw/usb.h	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
i386-dm/cpu.h	diff1 \|	\|	blob \| history
i386-dm/exec-dm.c	diff1 \|	\|	blob \| history
i386-dm/hookslib.mak	diff1 \|	\|	blob \| history
keymaps.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
qemu-char.h	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-lock.h	\|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
tests/Makefile	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history
vnc_keysym.h	diff1 \|	diff2 \|	blob \| history
xen-config-host.h	diff1 \|	\|	blob \| history
xen-config-host.mak	diff1 \|	\|	blob \| history
xen-hooks.mak	diff1 \|	\|	blob \| history
xen-vl-extra.c	diff1 \|	\|	blob \| history
xenstore.c	diff1 \|	\|	blob \| history