diff options
| author | Peter Maydell | 2018-04-06 18:51:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-06 18:51:21 +0200 |
| commit | 08e173f29461396575c85510eb41474b993cb1fb (patch) | |
| tree | b4acff2b6b9296d138b9388774af21c7cbbe9a14 /ui/sdl2-gl.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180407' into staging (diff) | |
| parent | crypto: ensure we use a predictable TLS priority setting (diff) | |
| download | qemu-08e173f29461396575c85510eb41474b993cb1fb.tar.gz qemu-08e173f29461396575c85510eb41474b993cb1fb.tar.xz qemu-08e173f29461396575c85510eb41474b993cb1fb.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
# gpg: Signature made Fri 06 Apr 2018 14:29:10 BST
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-pull-request:
crypto: ensure we use a predictable TLS priority setting
docs: Document -object tls-creds-x509 priority=xxx
docs: update information for TLS certificate management
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-gl.c')
0 files changed, 0 insertions, 0 deletions