projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd0d199
bbfbb6c
)
Merge remote branch 'upstream/master'
author
Rafal Krypa
<r.krypa@samsung.com>
Wed, 24 Nov 2010 07:22:50 +0000
(16:22 +0900)
committer
Rafal Krypa
<r.krypa@samsung.com>
Wed, 24 Nov 2010 07:22:50 +0000
(16:22 +0900)
1
2
qemu-char.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qemu-char.c
Simple merge