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 /tools/ChangeLog-2011 | |
| 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 'tools/ChangeLog-2011')
| -rw-r--r-- | tools/ChangeLog-2011 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/ChangeLog-2011 b/tools/ChangeLog-2011 index db771c82d..6821a8782 100644 --- a/tools/ChangeLog-2011 +++ b/tools/ChangeLog-2011 @@ -5,10 +5,6 @@ commit log, and generate a top-level ChangeLog file from logs at "make dist". See doc/HACKING for details. -2011-10-13 Marcus Brinkmann <[email protected]> - - * Makefile.am: Port to NPth. - 2011-08-26 Werner Koch <[email protected]> * gpgconf-comp.c (gc_component): Mark for translation. Suggested |