diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-16 19:11:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-16 19:11:59 +0100 |
| commit | 9c1f5bbc739f3278353becf94839551afed0fdbd (patch) | |
| tree | 2136572f76a5be48fd000bab77f24ca2b76c9615 /include/block/block.h | |
| parent | 61f7901bb8a7f2f2503b5b025c4c33dbeac9cf5b (diff) | |
| parent | 468a895bce1492cf83bb8be0d995ccdfcf4f2785 (diff) | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20151016' into staging
cocoa queue:
* fixes for compiler warnings
* fix mouse cursor flickering
# gpg: Signature made Fri 16 Oct 2015 11:09:46 BST 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-20151016:
ui/cocoa.m: blinky mouse cursor fix
ui/cocoa.m: addRemovableDevicesMenuItems() warning fix
ui/cocoa.m: eliminate normalWindow warning
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/block/block.h')
0 files changed, 0 insertions, 0 deletions