]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c00c0dc 9197a7c)
Merge remote-tracking branch 'spice/spice.v40' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:13:26 +0000 (17:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:13:26 +0000 (17:13 -0500)

Trivial merge
Qemu copy for testing