projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24e838b 2d6c1ef)
Merge remote branch 'amit/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 24 Mar 2011 13:11:58 +0000 (08:11 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 24 Mar 2011 13:11:58 +0000 (08:11 -0500)
1  2 
qemu-char.c patch | diff1 | diff2 | blob | history

diff --cc qemu-char.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.