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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 46e4eb9 e01f4a1)

author	Ian Jackson <iwj@mariner.uk.xensource.com>
	Wed, 14 May 2008 13:45:40 +0000 (14:45 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Wed, 14 May 2008 13:45:40 +0000 (14:45 +0100)
commit	a1fa7745c08f26aee821df61f0dca2dcb48abbb7
tree	82bfedc89112ff25abec860e96f1f3ddb60d547c	tree
parent	46e4eb92981742c1a1d8e1aa6d88fe55eacac912	commit \| diff
parent	e01f4a1ce007d455a1d7a6921411fc0bcc6ad4ec	commit \| diff

Merge branch 'origin'

Conflicts:
hw/ide.c
hw/pc.c
loader.c
osdep.c
osdep.h
qemu-common.h
(All easily resolved.)

16 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
audio/audio.c	diff1 \|	diff2 \|	blob \| history
audio/audio.h	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
cutils.c	diff1 \|	diff2 \|	blob \| history
dyngen.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
linux-user/elfload.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
monitor.c	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
osdep.h	diff1 \|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
tests/qruncom.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history
vnc.c	diff1 \|	diff2 \|	blob \| history

Obsolete Qemu-dm 3.3 stable branch