]> granicus.if.org Git - neomutt/commitdiff
merge: upstream
authorRichard Russon <rich@flatcap.org>
Sun, 1 May 2016 13:39:59 +0000 (14:39 +0100)
committerRichard Russon <rich@flatcap.org>
Sun, 1 May 2016 13:39:59 +0000 (14:39 +0100)
 * Fix IDNA functions for systems without iconv.
 * Fix mutt_protect() when INLINE is set. (closes #3828)
 * Create a wrapper sys_socket.h to work around Solaris namespace issues.  (closes #3833)
 * automatic post-release commit for mutt-1.6.1

1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge