Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150611-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 11 Jun 2015 13:40:25 +0000 (14:40 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 11 Jun 2015 13:40:25 +0000 (14:40 +0100)
commitafa25c4bb5bd0732dca4aa0691fd4682d242925f
tree199c41987c2e4e4fbf5c5da2eea120ce8f5a6034
parent0b70743d4f4f260b2fe6ed53fecc6bc6cda13910
parent08d49df0dbaacc220a099dbfb644e1dc0eda57be
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150611-1' into staging

sdl2: fix crash in handle_windowevent() when restoring the screen size

# gpg: Signature made Thu Jun 11 08:57:38 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-sdl-20150611-1:
  sdl2: fix crash in handle_windowevent() when restoring the screen size

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>