summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-25 15:57:27 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-25 15:57:27 -0500
commit5257144a7860313c8cf19271c85f76fcbd123c39 (patch)
treed66a572fa1c28c3c47bfb33c66cd6553da87f7e6 /Makefile
parent79f2007578a0a205e25a6f299cc52d6732337089 (diff)
parent1f8f987d349f8f1bace4b47a83323b68ab0e084c (diff)
downloadqemu-5257144a7860313c8cf19271c85f76fcbd123c39.tar.gz
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Amos Kong # Via Luiz Capitulino * luiz/queue/qmp: monitor: introduce query-command-line-options Message-id: 1366922656-32545-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions