]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c628d74 7e02dc6)
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 01:37:23 +0000 (19:37 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 1 Feb 2013 01:37:23 +0000 (19:37 -0600)
# By Henry Harrington (1) and Stefan Weil (1)
# Via Andreas Färber
* afaerber-or/cocoa-for-upstream:
  cocoa: Replace non-portable asprintf() by g_strdup_printf()
  cocoa: Fix VBE function Set Display Start


Trivial merge
Qemu copy for testing