diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 17:04:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 17:04:31 +0100 |
| commit | 9438fe9e56760e5e5e11d6c7d12ed9c64a0c8446 (patch) | |
| tree | bb91f03e1bb65f7d48d9f6c927a87ce53d6d510a /.gitignore | |
| parent | eb9d0ea063fc7bdfab76b84085602a9e48d13ec7 (diff) | |
| parent | 7b02f5447c64d1854468f758398c9f6fe9e5721f (diff) | |
Merge remote-tracking branch 'remotes/elmarco/tags/rm-libcacard' into staging
Remove libcacard
# gpg: Signature made Wed 23 Sep 2015 22:37:11 BST using RSA key ID 75969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/rm-libcacard:
libcacard: use the standalone project
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index fdd721dba1..75bceb9975 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ /trace/generated-ust.c /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h -/libcacard/trace/generated-tracers.c *-timestamp /*-softmmu /*-darwin-user |