]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eca968d d9676f8)
Merge remote-tracking branch 'alon/pull-libcacard-assert' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:14:06 +0000 (10:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:14:06 +0000 (10:14 -0500)

Trivial merge
Qemu copy for testing