diff options
| author | Peter Maydell | 2017-06-13 15:40:17 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-13 15:40:17 +0200 |
| commit | 6f153ceb9bb8233dd3887320737aba90554ddd70 (patch) | |
| tree | 4b89143498f739e4c2b05c787714d7131d8a20d9 /ui/cocoa.m | |
| parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170613' i... (diff) | |
| parent | monitor: resurrect handle_qmp_command trace event (diff) | |
| download | qemu-6f153ceb9bb8233dd3887320737aba90554ddd70.tar.gz qemu-6f153ceb9bb8233dd3887320737aba90554ddd70.tar.xz qemu-6f153ceb9bb8233dd3887320737aba90554ddd70.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Tue 13 Jun 2017 14:35:25 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
monitor: resurrect handle_qmp_command trace event
monitor: add handle_hmp_command trace event
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/cocoa.m')
0 files changed, 0 insertions, 0 deletions