diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-10 14:04:27 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-10 14:04:27 +0100 |
commit | df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8 (patch) | |
tree | c2b5757d53b6c108d5974501101ec8c7085fd00f /linux-user/microblaze/target_signal.h | |
parent | daf6b59be8c703264765a533bc63421caef95225 (diff) | |
parent | c6093a05d6a84d2144bb6462cf20e907eddf8aeb (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging
configure: don't warn on old sdl/gtk versions if disabled.
keymap + gtk fixes.
# gpg: Signature made Tue 10 Apr 2018 10:23:37 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20180410-pull-request:
configure: don't warn SDL abi if disabled
configure: don't warn GTK if disabled
gtk: drop pointless code from gd_window_close
ui: fix keymap detection under Xwayland
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/microblaze/target_signal.h')
0 files changed, 0 insertions, 0 deletions