]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/pixman.v5' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:53:03 +0000 (08:53 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:53:03 +0000 (08:53 -0600)
* kraxel/pixman.v5:
  pixman: cleanup properly on make distclean
  pixman: add licensing info
  pixman: build internal version early
  pixman: pass cflags, add -fPIC
  pixman: disable gtk
  pixman: set --host for cross builds
  pixman: add output dir to include path

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
qemu-pixman.c
qemu-pixman.h

diff --cc qemu-pixman.c
Simple merge
diff --cc qemu-pixman.h
Simple merge