]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 16:02:29 +0000 (11:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 16:02:29 +0000 (11:02 -0500)
commit96b3d73f5ad5838690d42666c566a48be9d173dc
treeff8308c6bb8494acc5f698308fded86cc5cd4e67
parent549f808b577c7709aeaa0244972d3ae28fad97d2
parentf795e743bd026471bcf7952d272424f1fd32e83b
Merge remote-tracking branch 'qmp/queue/qmp' into staging

Conflicts:
ui/spice-core.c
hmp-commands.hx
migration.c
monitor.c
qmp-commands.hx
ui/spice-core.c