diff options
| author | Peter Maydell | 2014-06-30 16:56:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-06-30 16:56:00 +0200 |
| commit | ec9fe956d5c728da770db5ec9bc429080ccb5043 (patch) | |
| tree | 0923a1fc3feaafa115e329c518d6622fb44616dc /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20140630' into... (diff) | |
| parent | tests/test-qmp-event: fix for GLib < 2.31 (diff) | |
| download | qemu-ec9fe956d5c728da770db5ec9bc429080ccb5043.tar.gz qemu-ec9fe956d5c728da770db5ec9bc429080ccb5043.tar.xz qemu-ec9fe956d5c728da770db5ec9bc429080ccb5043.zip | |
Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging
* remotes/bonzini/small-fixes:
tests/test-qmp-event: fix for GLib < 2.31
serial: poll the serial console with G_IO_HUP
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions