]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0677e27 c042493)
Merge remote-tracking branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 26 Apr 2012 20:21:01 +0000 (15:21 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 26 Apr 2012 20:21:01 +0000 (15:21 -0500)
* stefanha/tracing:
  Beautify makefile commands for generation of files with tracetool
  Generic elimination of auto-generated files

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Qemu copy for testing