]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd86df7 60b46aa)
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 11:54:16 +0000 (06:54 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 11:54:16 +0000 (06:54 -0500)
* afaerber-or/cocoa-for-upstream:
  cocoa: Suppress Cocoa frontend for -qtest
  arch_init: Fix AltiVec build on Darwin/ppc


Trivial merge
Qemu copy for testing