]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81fe74d a13ccc9)
Merge remote-tracking branch 'spice/spice.v51' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:08:15 +0000 (15:08 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:08:15 +0000 (15:08 -0500)
* spice/spice.v51:
  ui/spice-display: use uintptr_t when casting qxl physical addresses
  ui/spice-display.c: Fix compilation warnings on 32 bit hosts


Trivial merge
Qemu copy for testing