]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'spice/spice.v71' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jun 2013 19:33:09 +0000 (14:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jun 2013 19:33:09 +0000 (14:33 -0500)
# By Gerd Hoffmann (1) and Hans de Goede (1)
# Via Gerd Hoffmann
* spice/spice.v71:
  spice: Add -spice disable-agent-file-transfer cmdline option (rhbz#961850)
  qxl: fix Coverity scan SIGN_EXTENSION error

Message-id: 1372060666-18182-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
qemu-options.hx

diff --cc qemu-options.hx
Simple merge