projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03a0e94 08cc67f)
Merge remote-tracking branch 'spice/spice.v45' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:12:14 +0000 (10:12 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Oct 2011 15:12:14 +0000 (10:12 -0500)
1  2 
monitor.c patch | diff1 | diff2 | blob | history

diff --cc monitor.c
Simple merge
Domain: SDK / Emulator;