]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21bcc59 46c7fc1)
Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Oct 2010 14:51:03 +0000 (09:51 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Oct 2010 14:51:03 +0000 (09:51 -0500)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Qemu copy for testing