summaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-20 12:04:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-20 12:04:05 +0100
commit8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283 (patch)
treee271f6038037fadd5af453ee879a6142cdd8ad0b /default-configs
parent87a60ee84f8abfc26f200ceac86ef32a690b9e21 (diff)
parenta62e20f6f84d747e55891a0d8aadd0737297571e (diff)
downloadqemu-8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283.tar.gz
Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' into staging
git orderfile and editorconfig for 2.10 # gpg: Signature made Thu 20 Jul 2017 09:00:01 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/misc-20170720-pull-request: add editorconfig add scripts/git.orderfile Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'default-configs')
0 files changed, 0 insertions, 0 deletions