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

1  2 
init.c
init.h
main.c

diff --cc init.c
Simple merge
diff --cc init.h
Simple merge
diff --cc main.c
Simple merge