diff options
| author | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
| commit | 0868997e186cd847663668f9d7a29806a12da2d2 (patch) | |
| tree | 73645f778a2d16213723121a76d2b38ca90edfcc /tests/Makefile.am | |
| parent | Add lost ChangeLog entry. (diff) | |
| parent | Silence gcc warning. (diff) | |
| download | gnupg-npth.tar.gz gnupg-npth.zip | |
Merge branch 'master' into npthnpth
Conflicts:
ChangeLog-2011
Makefile.am
agent/ChangeLog-2011
agent/gpg-agent.c
dirmngr/ChangeLog-2011
dirmngr/dirmngr.c
doc/HACKING
g13/g13.c
po/de.po
scd/ChangeLog-2011
scd/apdu.c
scd/command.c
scd/scdaemon.c
scripts/gitlog-to-changelog
tools/ChangeLog-2011
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2142d33d6..307d82952 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,6 +41,8 @@ EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \ text-1.txt text-2.txt text-3.txt \ text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \ text-2.osig.pem text-2.osig-bad.pem \ + samplekeys/steed-self-signing-nonthority.pem \ + samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \ samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \ samplekeys/cert_g10code_pete1.pem \ samplekeys/cert_g10code_test1.pem \ |