]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb23ae6 3cf0bed)
Merge remote-tracking branch 'mdroth/qga-pull-3-12-2012' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:52:34 +0000 (20:52 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 13 Mar 2012 01:52:34 +0000 (20:52 -0500)
* mdroth/qga-pull-3-12-2012:
  qemu-ga: add guest-sync-delimited
  qemu-ga: add guest-network-get-interfaces command
  qemu-ga: add win32 guest-suspend-ram command
  qemu-ga: add win32 guest-suspend-disk command.
  qemu-ga: add guest-suspend-hybrid
  qemu-ga: add guest-suspend-ram
  qemu-ga: add guest-suspend-disk

1  2 
configure patch | diff1 | diff2 | blob | history

diff --cc configure
Simple merge
Qemu copy for testing