]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e855de 4995f0d)
Merge remote-tracking branch 'alon/pull-libcacard.data' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:14:49 +0000 (17:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:14:49 +0000 (17:14 -0500)

Trivial merge
Qemu copy for testing