]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ad1db3b 16529ce)
Merge remote-tracking branch 'bonzini/build-urgent' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 15:27:13 +0000 (09:27 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Nov 2012 15:27:13 +0000 (09:27 -0600)
commit2954525b3b8474fa1d637dd3822ab35c95596856
tree355069a0cdc50c2139755e84bcc65a18b5ef7962tree
parentad1db3b341d3d55e6d722ad868bd48ed4425c9fbcommit | diff
parent16529cedcef18bf116f10279e9c9abb6645467d6commit | diff
Merge remote-tracking branch 'bonzini/build-urgent' into staging

* bonzini/build-urgent:
  Makefile: Add missing dependency (fix parallel builds)
  tests: link in stubs
  libcacard: link in stubs
  libcacard: make unnesting rules available to Makefile.objs

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing