| commit | ffdb1409a79c9cc91afd9f58df625fdca16bf8b9 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 19 Jun 2015 11:54:08 +0000 (19 12:54 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 19 Jun 2015 11:54:08 +0000 (19 12:54 +0100) | ||
| tree | 0b87f4e149b634b39872eede986f6099434ee03a | treesnapshot (tar.gz zip) |
| parent | 89e9429c3cb42400f3a80890e0c20b18aa62a11d | commitdiff |
| parent | 693a3e01af8082f855094061650311fcaf3e1269 | commitdiff |
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>
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>