Merge remote-tracking branch 'qemu/master'
commit0929b6f739c1e298bc58cfe2635dba89e79d969d
authorStefan Weil <sw@weilnetz.de>
Sun, 30 Nov 2014 21:30:21 +0000 (30 22:30 +0100)
committerStefan Weil <sw@weilnetz.de>
Sun, 30 Nov 2014 21:30:21 +0000 (30 22:30 +0100)
treef629b65eddf377d2a59e17a8e93a9a4ab2453cd8
parent8d3b3e811ea23a07a6c5c0feeafb4d1c2b084e55
parentdb12451decf7dfe0f083564183e135f2095228b9
Merge remote-tracking branch 'qemu/master'
monitor.c
qemu-options.hx
vl.c