]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20151016' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 16 Oct 2015 18:11:59 +0000 (19:11 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 16 Oct 2015 18:11:59 +0000 (19:11 +0100)
commit9c1f5bbc739f3278353becf94839551afed0fdbd
tree2136572f76a5be48fd000bab77f24ca2b76c9615
parent61f7901bb8a7f2f2503b5b025c4c33dbeac9cf5b
parent468a895bce1492cf83bb8be0d995ccdfcf4f2785
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20151016' into staging

cocoa queue:
 * fixes for compiler warnings
 * fix mouse cursor flickering

# gpg: Signature made Fri 16 Oct 2015 11:09:46 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"

* remotes/pmaydell/tags/pull-cocoa-20151016:
  ui/cocoa.m: blinky mouse cursor fix
  ui/cocoa.m: addRemovableDevicesMenuItems() warning fix
  ui/cocoa.m: eliminate normalWindow warning

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>