]> git.proxmox.com Git - qemu.git/commit
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)
commit82ac96a72b860f6a4f125edd12f85cb21b3d66bf
treed0df62dba6fa89870cb1cbafdc412ba2c0b81446
parent90ca64a970b1d10352df3b2c68099341e900abe9
parentb65ee4fa29ebfffb96a3ea983c97a664d30efd3f
Merge remote-tracking branch 'sweil/for-1.1' into staging

* 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
qemu-options.hx