diff options
| author | Peter Maydell | 2015-09-15 15:11:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-15 15:11:28 +0200 |
| commit | 1078f5db8ada5097600443838492ef07103790c2 (patch) | |
| tree | 987695c48f50fe1a20747e115322ba1b578b7691 /include/exec/memory.h | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st... (diff) | |
| parent | gtk: use setlocale() for LC_MESSAGES only (diff) | |
| download | qemu-1078f5db8ada5097600443838492ef07103790c2.tar.gz qemu-1078f5db8ada5097600443838492ef07103790c2.tar.xz qemu-1078f5db8ada5097600443838492ef07103790c2.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150915-1' into staging
gtk: misc grab tweaks, locale fix.
# gpg: Signature made Tue 15 Sep 2015 11:35:36 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-gtk-20150915-1:
gtk: use setlocale() for LC_MESSAGES only
gtk: don't grab input when entering fullscreen.
gtk: set free_scale when setting zoom_fit
gtk: trace input grab reason
gtk: move gd_update_caption calls to gd_{grab,ungrab}_{pointer,keyboard}
gtk: check for existing grabs in gd_grab_{pointer,keyboard}
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions