]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd5d5c5 a6f9dd0)
Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:24:26 +0000 (15:24 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:24:26 +0000 (15:24 -0600)

Trivial merge
Qemu copy for testing