Marcus Brinkmann 0868997e18 Merge branch 'master' into npth ...

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

2012-01-03 18:13:19 +01:00

..

agent.h

Amend the agent code with more comments.

2011-12-05 15:05:57 +01:00

cache.c

Initial port to Npth.

2011-12-02 22:05:55 +01:00

call-pinentry.c

Merge branch 'master' into npth

2012-01-03 18:13:19 +01:00

call-scd.c

Merge branch 'master' into npth

2012-01-03 18:13:19 +01:00

ChangeLog-2011

Generate the ChangeLog from commit logs.

2011-12-02 21:59:31 +01:00

command-ssh.c

Improve ssh card key diagnostic message.

2011-12-02 21:57:32 +01:00

command.c

Require Libassuan 2.0.3

2011-12-20 11:12:21 +01:00

cvt-openpgp.c

Fix size_t vs int issues.

2011-06-01 21:43:30 +02:00

cvt-openpgp.h

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

divert-scd.c

Fix usage of SHA-2 algorithm with OpenPGP cards.

2011-03-02 15:35:10 +01:00

findkey.c

Initial port to Npth.

2011-10-13 17:09:29 +02:00

genkey.c

Allow no protection in pinentry-mode=loopback.

2011-09-13 08:33:43 +02:00

gpg-agent.c

Merge branch 'master' into npth

2012-01-03 18:13:19 +01:00

keyformat.txt

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

learncard.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

Makefile.am

Generate the ChangeLog from commit logs.

2011-12-02 21:59:31 +01:00

pkdecrypt.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

pksign.c

Fix ECDSA 521 bit signing.

2011-02-07 14:38:39 +01:00

preset-passphrase.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

protect-tool.c

Added gpg-agent OPTION "s2k-count".

2011-06-29 13:17:25 +02:00

protect.c

Added gpg-agent OPTION "s2k-count".

2011-06-29 13:17:25 +02:00

t-protect.c

Added gpg-agent OPTION "s2k-count".

2011-06-29 13:17:25 +02:00

trans.c

Changed to GPLv3.

2007-07-04 19:49:40 +00:00

trustlist.c

Initial port to Npth.

2011-10-13 17:09:29 +02:00

w32main.c

Nuked almost all trailing white space.

2011-02-04 12:57:53 +01:00

w32main.h

Changed to GPLv3.

2007-07-04 19:49:40 +00:00