]> git.proxmox.com Git - qemu.git/commit
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)
commit2854c549e84532f0b76b7884f1903da8a1bf4dbb
tree4a6483a61dfdb04fb9f48073470dd78566aba2ab
parentc628d74738bfdb872f771407a2790509ec4520f9
parent7e02dc63b8f16372107434d44269e21cdff5d19d
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging

# 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