]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d9dde9 d03ee40)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:48:00 +0000 (20:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:48:00 +0000 (20:48 -0500)
* qmp/queue/qmp:
  qapi-schema.json: fix comment for type ObjectPropretyInfo
  qapi-schema: fix typos and explain 'spice' auth
  qjson.h: include compiler.h for GCC_FMT_ATTR


Trivial merge
Qemu copy for testing