projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0956457 02e9591)
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 patch | diff1 | diff2 | blob | history
json-parser.c patch | diff1 | diff2 | blob | history

diff --cc check-qjson.c
Simple merge
diff --cc json-parser.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.