diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 19:44:34 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-15 19:44:34 +0100 |
commit | cc35a44cf7b522b1fd0b786562b7de4b881c41b0 (patch) | |
tree | ab9751a4ceac9c6ad57e748a8ab5407c5cbf75aa /ui/sdl2.c | |
parent | f2bcdc8de018d33ecf93da7a94f327956ecf76ea (diff) | |
parent | e4d9df4fb16861f413374b69fcdb12c8c7a4a17e (diff) | |
download | qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.tar.gz qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.tar.bz2 qemu-cc35a44cf7b522b1fd0b786562b7de4b881c41b0.zip |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
exec: file_ram_alloc(): print error when prealloc fails
monitor: fix debug print compiling error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2.c')
0 files changed, 0 insertions, 0 deletions