]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'qmp/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jun 2010 14:39:01 +0000 (09:39 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 Jun 2010 14:39:01 +0000 (09:39 -0500)
1  2 
check-qjson.c
json-parser.c

diff --cc check-qjson.c
Simple merge
diff --cc json-parser.c
Simple merge