]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
QEMU mirror