diff options
author | Peter Maydell | 2015-09-03 17:17:28 +0200 |
---|---|---|
committer | Peter Maydell | 2015-09-03 17:17:28 +0200 |
commit | b041066421e8dcc7d080dfcfd83551c9c9f24ade (patch) | |
tree | 48a0167a139d9dde4c07237d32460ea10b2872db /scripts/qmp/qmp-shell | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150903' into staging (diff) | |
parent | trace-events: Add hmp completion (diff) | |
download | qemu-b041066421e8dcc7d080dfcfd83551c9c9f24ade.tar.gz qemu-b041066421e8dcc7d080dfcfd83551c9c9f24ade.tar.xz qemu-b041066421e8dcc7d080dfcfd83551c9c9f24ade.zip |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Thu 03 Sep 2015 15:46:52 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
trace-events: Add hmp completion
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qmp/qmp-shell')
0 files changed, 0 insertions, 0 deletions