]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 10 Apr 2012 13:10:41 +0000 (08:10 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 10 Apr 2012 13:10:41 +0000 (08:10 -0500)
* stefanha/trivial-patches:
  make: fix clean rule by removing build file in qom/
  configure: Link qga against UST tracing related libraries
  configure: Link QEMU against 'liburcu-bp'
  main-loop: make qemu_event_handle static
  block/curl: Replace usleep by g_usleep
  qtest: Add missing GCC_FMT_ATTR
  w32: Undefine error constants before their redefinition
  configure: fix mingw32 libs_qga typo

1  2 
configure
main-loop.c

diff --cc configure
Simple merge
diff --cc main-loop.c
Simple merge