]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6034a3 5a8a49d)
Merge remote-tracking branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:14:00 +0000 (07:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Jun 2011 12:14:00 +0000 (07:14 -0500)
1  2 
xen-all.c patch | diff1 | diff2 | blob | history

diff --cc xen-all.c
Simple merge
Qemu copy for testing