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

..

backend.c

Nuked almost all trailing white space.

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

backend.h

Nuked almost all trailing white space.

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

be-encfs.c

Nuked almost all trailing white space.

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

be-encfs.h

Nuked almost all trailing white space.

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

be-truecrypt.c

Nuked almost all trailing white space.

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

be-truecrypt.h

Nuked almost all trailing white space.

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

call-gpg.c

Initial port to Npth.

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

call-gpg.h

[g13] Add RECIPEINT and CREATE command.

2009-10-19 09:18:46 +00:00

ChangeLog-2011

Generate the ChangeLog from commit logs.

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

create.c

Add a flag parameter to dotlock_create.

2011-09-28 15:41:58 +02:00

create.h

[g13] Add RECIPEINT and CREATE command.

2009-10-19 09:18:46 +00:00

encfs-1.5_annotate.diff

Add patches for EncFs

2010-11-10 12:49:39 +00:00

encfs-1.7.3_annotate.diff

Add patches for EncFs

2010-11-10 12:49:39 +00:00

g13.c

Merge branch 'master' into npth

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

g13.h

Nuked almost all trailing white space.

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

keyblob.h

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

mount.c

Add a flag parameter to dotlock_create.

2011-09-28 15:41:58 +02:00

mount.h

Nuked almost all trailing white space.

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

mountinfo.c

Fix size_t vs int issues.

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

mountinfo.h

Nuked almost all trailing white space.

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

runner.c

Initial port to Npth.

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

runner.h

Nuked almost all trailing white space.

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

server.c

Nuked almost all trailing white space.

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

server.h

Nuked almost all trailing white space.

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

utils.c

Nuked almost all trailing white space.

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

utils.h

Nuked almost all trailing white space.

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