diff options
| author | Peter Maydell | 2018-11-20 15:11:00 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-20 15:11:00 +0100 |
| commit | 53744e0a182a24dc9e78f2d9b31a39a33da79484 (patch) | |
| tree | 615ca3905876deeb3fa677aeac1b9f4d1ba604f2 /tests/qapi-schema/include-nested-err.err | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 (diff) | |
| download | qemu-53744e0a182a24dc9e78f2d9b31a39a33da79484.tar.gz qemu-53744e0a182a24dc9e78f2d9b31a39a33da79484.tar.xz qemu-53744e0a182a24dc9e78f2d9b31a39a33da79484.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into staging
pc-*-3.1 machine-types
# gpg: Signature made Tue 20 Nov 2018 13:43:24 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-for-3.1-pull-request:
hw/i386: add pc-i440fx-3.1 & pc-q35-3.1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qapi-schema/include-nested-err.err')
0 files changed, 0 insertions, 0 deletions