]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'spice/bugfix.2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 16 Nov 2010 20:11:05 +0000 (14:11 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 16 Nov 2010 20:11:05 +0000 (14:11 -0600)
1  2 
ui/spice-core.c

diff --cc ui/spice-core.c
Simple merge