]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77d4f95 50e32ea)
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jun 2010 14:21:43 +0000 (09:21 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jun 2010 14:21:43 +0000 (09:21 -0500)
1  2 
net.c patch | diff1 | diff2 | blob | history

diff --cc net.c
Simple merge
QEMU mirror