]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e44928 3a019b6)
Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:05 +0000 (08:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:23:05 +0000 (08:23 -0600)
1  2 
monitor.c patch | diff1 | diff2 | blob | history

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