]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'sweil/for-1.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:06:50 +0000 (10:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:06:50 +0000 (10:06 -0500)
* sweil/for-1.1:
  qemu-doc: Use QEMU instead of qemu for product name
  qemu-doc: Fix executable name in examples
  qemu-doc: Add missing parameter in description of -D option
  configure: Use QEMU instead of Qemu
  fix some common typos
  qemu-timer: Fix wrong error message

1  2 
qemu-options.hx

diff --cc qemu-options.hx
Simple merge