]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20160323-1' into staging
authorPeter Maydell <[email protected]>
Thu, 24 Mar 2016 13:43:30 +0000 (13:43 +0000)
committerPeter Maydell <[email protected]>
Thu, 24 Mar 2016 13:43:30 +0000 (13:43 +0000)
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 <[email protected]>"
# gpg:                 aka "Peter Maydell <[email protected]>"
# gpg:                 aka "Peter Maydell <[email protected]>"

* 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 <[email protected]>

Trivial merge
This page took 0.022366 seconds and 4 git commands to generate.