From: Anthony Liguori Date: Mon, 13 Jan 2014 01:50:52 +0000 (-0800) Subject: Merge remote-tracking branch 'pmaydell/tags/pull-cocoa-20140112' into staging X-Git-Tag: qemu-xen-4.5.0-rc1~265 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=dd089c0a1e928fb80ba8a37983c1b0e9232d1c8b;p=qemu-upstream-4.5-testing.git Merge remote-tracking branch 'pmaydell/tags/pull-cocoa-20140112' into staging cocoa queue: * pass command key to guest when VM has mousegrab * add .qcow2 to extension list for image load dialog * fix bugs in code for starting QEMU via image load dialog * fix resize/redraw interaction * draw window black if guest hasn't sent anything to screen * minor style/typo fixes * add myself as cocoa co-maintainer # gpg: Signature made Sun 12 Jan 2014 02:45:52 PM PST using RSA key ID 14360CDE # gpg: Can't check signature: public key not found * pmaydell/tags/pull-cocoa-20140112: MAINTAINERS: add myself as cocoa UI co-maintainer ui/cocoa: Remove stray tabs ui/cocoa: Draw black rectangle if we have no data yet ui/cocoa: Redraw at correct size when switching surface ui/cocoa: Fix code for starting QEMU via image file load dialog ui/cocoa: Add ".qcow2" to extension list for image load dialog ui/cocoa: Send warning message to stderr, not stdout ui/cocoa: Correct typos in comments and variable names ui/cocoa: Pass command key through to guest when VM has mousegrab Message-id: 1389567158-31066-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- dd089c0a1e928fb80ba8a37983c1b0e9232d1c8b