1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-29 02:22:45 +02:00

Merge branch 'scd-backport-2-0' of git+ssh://playfair.gnupg.org/git/gnupg into scd-backport-2-0

This commit is contained in:
NIIBE Yutaka 2012-06-15 16:50:45 +09:00
commit 29b431fcf9

View File

@ -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--/