From: Peter Maydell Date: Mon, 30 Jun 2014 14:42:35 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20140630' into staging X-Git-Tag: qemu-xen-4.6.0-rc1~340 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a4b31047c851c9a84247a9cc634eca5f99f559a6;p=qemu-upstream-4.6-testing.git Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20140630' into staging cocoa.next: * Honour -show-cursor option * Fix handling of absolute positioning devices * Cope with first surface being same as initial window size # gpg: Signature made Mon 30 Jun 2014 13:48:46 BST using RSA key ID 14360CDE # gpg: Good signature from "Peter Maydell " * remotes/pmaydell/tags/pull-cocoa-20140630: ui/cocoa: Honour -show-cursor command line option ui/cocoa: Fix handling of absolute positioning devices ui/cocoa: Add utility method to check if point is within window ui/cocoa: Cope with first surface being same as initial window size Signed-off-by: Peter Maydell --- a4b31047c851c9a84247a9cc634eca5f99f559a6