]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bec8eb8 4bdd041)
Merge remote-tracking branch 'mdroth/qga-pull-4-19-12' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 14:58:19 +0000 (09:58 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 14:58:19 +0000 (09:58 -0500)
* mdroth/qga-pull-4-19-12:
  qemu-ga: fix help output
  qemu-ga: generate missing stubs for fsfreeze


Trivial merge
Qemu copy for testing