]> granicus.if.org Git - neomutt/commitdiff
merge: quasi-delete
authorRichard Russon <rich@flatcap.org>
Thu, 18 Aug 2016 16:44:59 +0000 (17:44 +0100)
committerRichard Russon <rich@flatcap.org>
Thu, 18 Aug 2016 16:44:59 +0000 (17:44 +0100)
 * add ident to PATCHES
 * feature: quasi-delete

1  2 
OPS
PATCHES
curs_main.c
functions.h
mutt.h

diff --cc OPS
Simple merge
diff --cc PATCHES
index b23ea9e61983baaa416989f5582ded62dcadcb49,0827122363cce6b78e45a7499767cfec8a64a21d..29323ef48250204796e38c1b9ad806df9e683745
+++ b/PATCHES
@@@ -1,9 -1,1 +1,10 @@@
 +patch-cond-date-neomutt
 +patch-fmemopen-neomutt
 +patch-ifdef-neomutt
 +patch-initials-neomutt
 +patch-limit-current-thread-neomutt
 +patch-lmdb-neomutt
 +patch-nested-if-neomutt
 +patch-new-mail-neomutt
 +patch-progress-neomutt
+ patch-quasi-delete-neomutt
diff --cc curs_main.c
Simple merge
diff --cc functions.h
Simple merge
diff --cc mutt.h
Simple merge