From: Peter Maydell Date: Fri, 19 Jun 2015 11:54:08 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150619-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ffdb1409a79c9cc91afd9f58df625fdca16bf8b9;p=qemu.git Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150619-1' into staging cocoa queue: * Add Machine menu, with entries for pause, resume, reset, power down, and media change and eject for removable drives # gpg: Signature made Fri Jun 19 11:24:11 2015 BST using RSA key ID 14360CDE # gpg: Good signature from "Peter Maydell " * remotes/pmaydell/tags/pull-cocoa-20150619-1: ui/cocoa.m: Add machine menu items to change and eject removable drive media ui/cocoa.m: Add Reset and Power Down menu items to Machine menu ui/cocoa.m: Add Machine menu with pause and resume menu items Signed-off-by: Peter Maydell --- ffdb1409a79c9cc91afd9f58df625fdca16bf8b9