| commit | 9293fcfe253d29899e370ccf172a76b7eca49aac | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Oct 2017 11:03:52 +0000 (24 12:03 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 24 Oct 2017 11:03:52 +0000 (24 12:03 +0100) | ||
| tree | 6e4d7466f4aca6157109117697b0aff0f793b728 | treesnapshot (tar.gz zip) |
| parent | a61837da0f2122e01685f6b7aad3226c9a6fc289 | commitdiff |
| parent | 8172bdb2d0c829462f8c4fb2cb54a768d295a747 | commitdiff |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20171023-pull-request' into staging
fixes for the fallout of the recent ui and keymap merges.
# gpg: Signature made Mon 23 Oct 2017 09:02:24 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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/fixes-20171023-pull-request:
scripts: don't throw away stderr when checking out git submodules
ui: add qemu-keymap and shader to .gitignore
configure: disable qemu-keymap for linux-user qemu
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
fixes for the fallout of the recent ui and keymap merges.
# gpg: Signature made Mon 23 Oct 2017 09:02:24 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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/fixes-20171023-pull-request:
scripts: don't throw away stderr when checking out git submodules
ui: add qemu-keymap and shader to .gitignore
configure: disable qemu-keymap for linux-user qemu
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>