[git] GnuPG - branch, scd-backport-2-0, updated. gnupg-2.0.19-16-gcc13771

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, scd-backport-2-0 has been updated
       via  cc13771675f83624a7d850b73f92e43e085b71c8 (commit)
      from  a3ae21162ae14a6a1661ef1a6937601f6914528b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cc13771675f83624a7d850b73f92e43e085b71c8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 13 09:35:41 2012 +0200

    Fix generated ChangeLog entry.
    
    --
    Finally Jim's git-fix-log thingy comes handy.

diff --git a/scripts/git-log-fix b/scripts/git-log-fix
index af702fe..6760e86 100644
--- a/scripts/git-log-fix
+++ b/scripts/git-log-fix
@@ -1,3 +1,10 @@
 # This file is expected to be used via gitlog-to-changelog's --amend=FILE
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
+
+08178d1e130a856622c0b938a34eb109bde79262
+s/Conflicts:/--/
+
+dafa7aa621dfe36c5c6cf462d3ec0d6c614ab105
+# Fix old cherry-picked message.
+s/(fix wLangId in.*)/\1\n--/

-----------------------------------------------------------------------

Summary of changes:
 scripts/git-log-fix |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org