projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
93e0597
37628f1
)
Merge remote-tracking branch 'qmp/for-anthony' into staging
author
Anthony Liguori
<aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:16:24 +0000
(12:16 -0500)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:16:24 +0000
(12:16 -0500)
1
2
qerror.c
patch
|
diff1
|
diff2
|
blob
|
history
qerror.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qerror.c
Simple merge
diff --cc
qerror.h
Simple merge