]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f8bcac 57a33d8)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:29:11 +0000 (14:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:29:11 +0000 (14:29 -0500)
* qmp/queue/qmp:
  qapi: g_hash_table_find() instead of GHashTableIter.
  qmp: make block job command naming consistent


Trivial merge
Qemu copy for testing