diff options
| author | Peter Maydell | 2017-10-03 16:11:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-03 16:11:00 +0200 |
| commit | 0b7fe5aed7381802600a844742920935774bb6c6 (patch) | |
| tree | 08ecea64d883e9232f2db3498ac52cb549618856 /ui/sdl2-gl.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170929-pull-request' i... (diff) | |
| parent | watchdog: Allow setting action on the fly (diff) | |
| download | qemu-0b7fe5aed7381802600a844742920935774bb6c6.tar.gz qemu-0b7fe5aed7381802600a844742920935774bb6c6.tar.xz qemu-0b7fe5aed7381802600a844742920935774bb6c6.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-10-02' into staging
QAPI patches for 2017-10-02
# gpg: Signature made Mon 02 Oct 2017 12:09:32 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-10-02:
watchdog: Allow setting action on the fly
watchdog.h: Drop local redefinition of actions enum
qapi: Rename WatchdogExpirationAction enum
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-gl.c')
0 files changed, 0 insertions, 0 deletions