aboutsummaryrefslogtreecommitdiff
path: root/target-sh4
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-10-31 11:02:29 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-10-31 11:02:29 -0500
commit96b3d73f5ad5838690d42666c566a48be9d173dc (patch)
treeff8308c6bb8494acc5f698308fded86cc5cd4e67 /target-sh4
parent549f808b577c7709aeaa0244972d3ae28fad97d2 (diff)
parentf795e743bd026471bcf7952d272424f1fd32e83b (diff)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Conflicts: ui/spice-core.c
Diffstat (limited to 'target-sh4')
0 files changed, 0 insertions, 0 deletions