]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b55160c f9943cd)
Merge remote-tracking branch 'kraxel/pixman.v6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:41 +0000 (10:27 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jan 2013 16:27:41 +0000 (10:27 -0600)
* kraxel/pixman.v6:
  pixman: pass extra cflags and ldflags

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
1  2 
Makefile patch | diff1 | diff2 | blob | history
configure patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc configure
Simple merge
Qemu copy for testing