diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2015-11-25 14:33:01 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-11-25 14:33:01 +0100 |
| commit | 8c34d891b1594840d8394a3c9b92236c13254fd8 (patch) | |
| tree | 24d57ffe3e0c0d2c8288319574b17f51a1ba71c5 /include/qapi/qmp/json-lexer.h | |
| parent | 903c341d5742b160e52752eb6fdc1ba9b87dc52e (diff) | |
| parent | 4d7f853ff0054989a4f20f1f22d1ec489c669c3b (diff) | |
| download | focaccia-qemu-8c34d891b1594840d8394a3c9b92236c13254fd8.tar.gz focaccia-qemu-8c34d891b1594840d8394a3c9b92236c13254fd8.zip | |
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-25' into queue-block
One block patch for qemu 2.5-rc2. # gpg: Signature made Wed Nov 25 14:30:45 2015 CET using RSA key ID E838ACAD # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" * mreitz/tags/pull-block-for-kevin-2015-11-25: qemu-iotests: Add -nographic when starting QEMU in 119 and 120 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/qapi/qmp/json-lexer.h')
0 files changed, 0 insertions, 0 deletions