summaryrefslogtreecommitdiffstats
path: root/scripts/modules/module_block.py
diff options
context:
space:
mode:
authorPeter Maydell2019-03-12 19:31:56 +0100
committerPeter Maydell2019-03-12 19:31:56 +0100
commit9d867123659ac32edd2a0b64cabe2dca544f1d0e (patch)
tree5c0913a438ea78cf1ad36867cdcdd06c69224178 /scripts/modules/module_block.py
parentMerge remote-tracking branch 'remotes/kraxel/tags/audio-20190312-pull-request... (diff)
parentqmp-shell: fix nested json regression (diff)
downloadqemu-9d867123659ac32edd2a0b64cabe2dca544f1d0e.tar.gz
qemu-9d867123659ac32edd2a0b64cabe2dca544f1d0e.tar.xz
qemu-9d867123659ac32edd2a0b64cabe2dca544f1d0e.zip
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
qmp-shell: fix nested json regression One small bug fix. # gpg: Signature made Tue 12 Mar 2019 02:16:24 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/python-next-pull-request: qmp-shell: fix nested json regression Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/modules/module_block.py')
0 files changed, 0 insertions, 0 deletions