]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitfb43a4807ec06307048018d93a7f9e0828308bb5
treefdf550b9185381b356d6e502c53ffc743b96f6c0tree
parent0a87470116a169f0c764894e46014a77f5d32a9ecommit | diff
parent21a50d0b1a0745e485eff3e5aa393cdc4a1980b6commit | diff
Merge remote-tracking branch 'spice/spice.v64' into staging

* 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>
Qemu copy for testing