diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-04 15:00:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-04 15:00:17 +0000 |
| commit | 1bc8dae31baa8b02a1b8e70c3244232e03bbb3b2 (patch) | |
| tree | 3893590ded788d3cc7f01bef0302c925b9c87b4e /memory.c | |
| parent | 45da08fa8a26717eda5a18abac81b478d51d457f (diff) | |
| parent | dc5201714684fa9bf993e7be5f12d5293e9793d4 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141104-2' into staging
gtk: fix fullscreen with gtk3, fix build with older gtk2 versions.
# gpg: Signature made Tue 04 Nov 2014 13:42:09 GMT 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-20141104-2:
gtk: add GDK_KEY_pause #define
gtk: Hide the menubar when in fullscreen mode (lp 1294898)
gtk: Install vc accelerators on parent window
gtk: Install fullscreen accelerator on toplevel window
gtk: Grab accel_group from GtkDisplayState
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'memory.c')
0 files changed, 0 insertions, 0 deletions