]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1356b98 038c187)
Merge remote-tracking branch 'spice/spice.v68' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 23 Jan 2013 15:07:29 +0000 (09:07 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 23 Jan 2013 15:07:29 +0000 (09:07 -0600)
# By Alon Levy
# Via Gerd Hoffmann
* spice/spice.v68:
  qxl: change rom size to 8192
  qxl: stop using non revision 4 rom fields for revision < 4


Trivial merge
Qemu copy for testing