]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46a352a 2ba9de6)
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:13:09 +0000 (08:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:13:09 +0000 (08:13 -0500)
# By Peter Maydell
# Via Andreas Färber
* afaerber-or/cocoa-for-upstream:
  cocoa: Avoid deprecated NSOpenPanel beginSheetForDirectory
  cocoa: Avoid deprecated NSOpenPanel filename method
  cocoa: Avoid deprecated CPS* functions
  cocoa: Fix leaks of NSScreen and NSConcreteMapTable


Trivial merge
Qemu copy for testing