diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-14 16:19:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-14 16:19:37 +0000 |
| commit | 7074ab12c81a1b2b1e0e1c40983f56b2c5ccc494 (patch) | |
| tree | 7534a14882a764862b6e1f7457e554315e782f4b | |
| parent | 9164add701788075f229b560bc3e92f6562ff857 (diff) | |
| parent | a0af8cee3cf6c2fc08fee5b69820c2f91d5b0b44 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
.gitignore updates for v4.0
# gpg: Signature made Thu 14 Mar 2019 15:04:29 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
tests/.gitignore: ignore test-qapi-emit-events.[ch] for in-tree builds
.gitignore: ignore docs/built created for in-tree builds
maint: Ignore built elf2dmp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 77522561b8..8f78221804 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /config-target.* /config.status /config-temp +/elf2dmp /trace-events-all /trace/generated-events.h /trace/generated-events.c @@ -119,6 +120,7 @@ /pc-bios/optionrom/kvmvapic.img /pc-bios/s390-ccw/s390-ccw.elf /pc-bios/s390-ccw/s390-ccw.img +/docs/built /docs/interop/qemu-ga-qapi.texi /docs/interop/qemu-ga-ref.html /docs/interop/qemu-ga-ref.info* diff --git a/tests/.gitignore b/tests/.gitignore index c88f8f2537..f9c0170881 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -14,6 +14,7 @@ test-* test-qapi-commands.[ch] include/test-qapi-commands-sub-module.[ch] test-qapi-commands-sub-sub-module.[ch] +test-qapi-emit-events.[ch] test-qapi-events.[ch] include/test-qapi-events-sub-module.[ch] test-qapi-events-sub-sub-module.[ch] |