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

..

apdu.c

Merge branch 'master' into npth

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

apdu.h

scd: Add more status word values for documentation.

2011-12-14 18:48:47 +01:00

app-common.h

scd: Introduce a virtual reader table.

2011-12-13 16:55:42 +01:00

app-dinsig.c

PC/SC pinpad support.

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

app-geldkarte.c

Nuked almost all trailing white space.

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

app-help.c

Nuked almost all trailing white space.

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

app-nks.c

PC/SC pinpad support.

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

app-openpgp.c

Fix pinpad input support for passphrase modification.

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

app-p15.c

Nuked almost all trailing white space.

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

app.c

Merge branch 'master' into npth

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

atr.c

scd: Add option --dump-atr to command APDU.

2011-12-15 15:21:02 +01:00

atr.h

scd: Add option --dump-atr to command APDU.

2011-12-15 15:21:02 +01:00

card-common.h

Nuked almost all trailing white space.

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

card-dinsig.c

Nuked almost all trailing white space.

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

card-p15.c

Nuked almost all trailing white space.

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

card.c

Nuked almost all trailing white space.

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

ccid-driver.c

Support the Cherry ST-2000 card reader.

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

ccid-driver.h

Nuked almost all trailing white space.

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

ChangeLog-2011

Generate the ChangeLog from commit logs.

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

command.c

Merge branch 'master' into npth

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

iso7816.c

Fix pinpad input support for passphrase modification.

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

iso7816.h

Fix pinpad input support for passphrase modification.

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

Makefile.am

Merge branch 'master' into npth

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

pcsc-wrapper.c

PC/SC pinpad support.

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

sc-copykeys.c

Nuked almost all trailing white space.

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

scdaemon.c

Merge branch 'master' into npth

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

scdaemon.h

scd: Add debug option for reader function calls.

2011-12-14 10:21:15 +01:00