]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Jun 2014 14:36:48 +0000 (15:36 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 11 Jun 2014 14:36:48 +0000 (15:36 +0100)
* remotes/bonzini/configure:
  rules.mak: Rewrite unnest-vars
  configure: unset interfering variables
  configure: duplicate/incorrect order of -lrt
  libcacard: improve documentation
  libcacard: actually use symbols file
  libcacard: replace qemu thread primitives with glib ones
  vscclient: use glib thread primitives not qemu
  glib-compat.h: add new thread API emulation on top of pre-2.31 API

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
libcacard/vreader.c

Simple merge