From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 24 Mar 2016 13:43:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20160323-1' into staging
X-Git-Tag: v2.6.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f57a35d81386df8840fd968251f44a95fc0f949;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20160323-1' into staging

cocoa queue:
 * update cocoa UI front end to use QKeyCodes
 * fix the help menu documentation links to actually work
   (with both an installed and an uninstalled QEMU)

# gpg: Signature made Wed 23 Mar 2016 14:31:01 GMT 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-20160323-1:
  ui/cocoa.m: switch to QKeyCode
  qapi-schema.json: Add power and keypad equal keys
  ui/cocoa.m: fix help menus

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

4f57a35d81386df8840fd968251f44a95fc0f949