]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a87470 21a50d0)
Merge remote-tracking branch 'spice/spice.v64' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:07 +0000 (08:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:19:07 +0000 (08:19 -0600)
* spice/spice.v64:
  spice: add new spice-server callbacks to ui/spice-display.c
  Fix the inconsistency in x509-dh-key-file parameter

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing