]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f5a1fa a6c4d36)
Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:17 +0000 (08:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:17 +0000 (08:31 -0500)
1  2 
monitor.c patch | diff1 | diff2 | blob | history

diff --cc monitor.c
Simple merge
Qemu copy for testing