diff options
| author | Peter Maydell | 2015-06-19 13:54:08 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-19 13:54:08 +0200 |
| commit | ffdb1409a79c9cc91afd9f58df625fdca16bf8b9 (patch) | |
| tree | 0b87f4e149b634b39872eede986f6099434ee03a /include | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | ui/cocoa.m: Add machine menu items to change and eject removable drive media (diff) | |
| download | qemu-ffdb1409a79c9cc91afd9f58df625fdca16bf8b9.tar.gz qemu-ffdb1409a79c9cc91afd9f58df625fdca16bf8b9.tar.xz qemu-ffdb1409a79c9cc91afd9f58df625fdca16bf8b9.zip | |
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 <peter.maydell@linaro.org>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions