]> granicus.if.org Git - neomutt/commitdiff
projects / neomutt / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 014dd09 6dc1634)
merge stable
authorKevin McCarthy <kevin@8t8.us>
Tue, 6 Jan 2015 22:31:48 +0000 (14:31 -0800)
committerKevin McCarthy <kevin@8t8.us>
Tue, 6 Jan 2015 22:31:48 +0000 (14:31 -0800)
1  2 
pgpkey.c patch | diff1 | diff2 | blob | history

diff --cc pgpkey.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.