diff options
| author | Peter Maydell | 2015-02-26 13:16:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-02-26 13:16:46 +0100 |
| commit | 041ccc922ee474693a2869d4e3b59e920c739bc0 (patch) | |
| tree | 36b046a650b26079b3cbf634ee9ae8fe19384319 /linux-user/main.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-20150219-1' into ... (diff) | |
| parent | qapi-types: add C99 index names to arrays (diff) | |
| download | qemu-041ccc922ee474693a2869d4e3b59e920c739bc0.tar.gz qemu-041ccc922ee474693a2869d4e3b59e920c739bc0.tar.xz qemu-041ccc922ee474693a2869d4e3b59e920c739bc0.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
qapi-types: add C99 index names to arrays
monitor: Fix missing err = NULL in client_migrate_info()
balloon: Fix typo
hmp: Fix warning from smatch (wrong argument in function call)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions